Correct handler range checks

atom/src/behaviors.h

@@ -205,8 +205,28 @@ enum Mode: uint8_t
     Property,
     ObjectMethod_Name,
     MemberMethod_Object,
+    Last // sentinel
 };
 
 }  // namespace GetState
 
+constexpr uint8_t _required_handler_size(uint8_t x) {
+    return (
+        (x > 128) ? 255 :
+        (x > 64) ? 128 :
+        (x > 32) ? 64 :
+        (x > 16) ? 32 :
+        (x > 8) ? 16 :
+        (x > 4) ? 8 :
+        (x > 2) ? 4 :
+        2
+    );
+}
+
+#define _handlers_size( a ) ( sizeof(a) / sizeof(a[0]) )
+#define validate_handlers( handlers, sentinel ) \
+    _handlers_size(handlers) - 1; \
+    static_assert(sentinel <= _handlers_size(handlers), "Not enough handlers for all enum values"); \
+    static_assert(_required_handler_size(sentinel) == _handlers_size(handlers), "Handlers size does not match enum width") \
+
 }  // namespace atom

atom/src/defaultvaluebehavior.cpp

@@ -202,19 +202,20 @@ handlers[] = {
     call_object_object_name_handler,
     object_method_handler,
     object_method_name_handler,
-    member_method_object_handler
+    member_method_object_handler,
+    no_op_handler,
+    no_op_handler
 };
 
+const auto mask = validate_handlers(handlers, DefaultValue::Mode::Last);
 
 }  // namespace
 
 
 PyObject*
 Member::default_value( CAtom* atom )
 {
-    if( get_default_value_mode() >= sizeof( handlers ) )
-        return no_op_handler( this, atom );  // LCOV_EXCL_LINE
-    return handlers[ get_default_value_mode() ]( this, atom );
+    return handlers[ get_default_value_mode() & mask ]( this, atom );
 }
 
 

atom/src/delattrbehavior.cpp

@@ -192,16 +192,15 @@ handlers[] = {
     property_handler
 };
 
+const auto mask = validate_handlers(handlers, DelAttr::Mode::Last);
 
 }  // namespace
 
 
 int
 Member::delattr( CAtom* atom )
 {
-    if( get_delattr_mode() >= sizeof( handlers ) )
-        return no_op_handler( this, atom );  // LCOV_EXCL_LINE
-    return handlers[ get_delattr_mode() ]( this, atom );
+    return handlers[ get_delattr_mode() & mask ]( this, atom );
 }
 
 

atom/src/getattrbehavior.cpp

@@ -256,18 +256,22 @@ handlers[] = {
     call_object_object_name_handler,
     object_method_handler,
     object_method_name_handler,
-    member_method_object_handler
+    member_method_object_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler
 };
 
+const auto mask = validate_handlers(handlers, GetAttr::Mode::Last);
+
 }  // namespace
 
 
 PyObject*
 Member::getattr( CAtom* atom )
 {
-    if( get_getattr_mode() >= sizeof( handlers ) )
-        return no_op_handler( this, atom );  // LCOV_EXCL_LINE
-    return handlers[ get_getattr_mode() ]( this, atom );
+    return handlers[ get_getattr_mode() & mask ]( this, atom );
 }
 
 }  // namespace atom

atom/src/getstatebehavior.cpp

@@ -124,18 +124,20 @@ handlers[] = {
     include_non_default_handler,
     property_handler,
     object_method_name_handler,
-    member_method_object_handler
+    member_method_object_handler,
+    include_handler,
+    include_handler
 };
 
+const auto mask = validate_handlers(handlers, GetState::Mode::Last);
+
 }  // namespace
 
 
 PyObject*
 Member::should_getstate( CAtom* atom )
 {
-    if( get_getstate_mode() >= sizeof( handlers ) )
-        return include_handler( this, atom );  // LCOV_EXCL_LINE
-    return handlers[ get_getstate_mode() ]( this, atom );
+    return handlers[ get_getstate_mode() & mask ]( this, atom );
 }
 
 }  // namespace atom

atom/src/postgetattrbehavior.cpp

@@ -93,19 +93,21 @@ handlers[] = {
     delegate_handler,
     object_method_value_handler,
     object_method_name_value_handler,
-    member_method_object_value_handler
+    member_method_object_value_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
 };
 
+const auto mask = validate_handlers(handlers, PostGetAttr::Mode::Last);
 
 }  // namespace
 
 
 PyObject*
 Member::post_getattr( CAtom* atom, PyObject* value )
 {
-    if( get_post_getattr_mode() >= sizeof( handlers ) )
-        return no_op_handler( this, atom, value );  // LCOV_EXCL_LINE
-    return handlers[ get_post_getattr_mode() ]( this, atom, value );
+    return handlers[ get_post_getattr_mode() & mask ]( this, atom, value );
 }
 
 

atom/src/postsetattrbehavior.cpp

@@ -106,19 +106,21 @@ handlers[] = {
     delegate_handler,
     object_method_old_new_handler,
     object_method_name_old_new_handler,
-    member_method_object_old_new_handler
+    member_method_object_old_new_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler
 };
 
+const auto mask = validate_handlers(handlers, PostSetAttr::Mode::Last);
 
 }  // namespace
 
 
 int
 Member::post_setattr( CAtom* atom, PyObject* oldvalue, PyObject* newvalue )
 {
-    if( get_post_setattr_mode() >= sizeof( handlers ) )
-        return no_op_handler( this, atom, oldvalue, newvalue );  // LCOV_EXCL_LINE
-    return handlers[ get_post_setattr_mode() ]( this, atom, oldvalue, newvalue );
+    return handlers[ get_post_setattr_mode() & mask ]( this, atom, oldvalue, newvalue );
 }
 
 

atom/src/postvalidatebehavior.cpp

@@ -97,19 +97,21 @@ handlers[] = {
     delegate_handler,
     object_method_old_new_handler,
     object_method_name_old_new_handler,
-    member_method_object_old_new_handler
+    member_method_object_old_new_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler
 };
 
+const auto mask = validate_handlers(handlers, PostValidate::Mode::Last);
 
 }  // namespace
 
 
 PyObject*
 Member::post_validate( CAtom* atom, PyObject* oldvalue, PyObject* newvalue )
 {
-    if( get_post_validate_mode() >= sizeof( handlers ) )
-        return no_op_handler( this, atom, oldvalue, newvalue );  // LCOV_EXCL_LINE
-    return handlers[ get_post_validate_mode() ]( this, atom, oldvalue, newvalue );
+    return handlers[ get_post_validate_mode() & mask ]( this, atom, oldvalue, newvalue );
 }
 
 }  // namespace atom

atom/src/setattrbehavior.cpp

@@ -377,19 +377,21 @@ handlers[] = {
     call_object_object_name_value_handler,
     object_method_value_handler,
     object_method_name_value_handler,
-    member_method_object_value_handler
+    member_method_object_value_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler
 };
 
+const auto mask = validate_handlers(handlers, SetAttr::Mode::Last);
 
 } // namespace
 
 
 int
 Member::setattr( CAtom* atom, PyObject* value )
 {
-    if( get_setattr_mode() >= sizeof( handlers ) )
-        return no_op_handler( this, atom, value );  // LCOV_EXCL_LINE
-    return handlers[ get_setattr_mode() ]( this, atom, value );
+    return handlers[ get_setattr_mode() & mask ]( this, atom, value );
 }
 
 

atom/src/validatebehavior.cpp

@@ -1000,16 +1000,15 @@ handlers[] = {
     member_method_object_old_new_handler
 };
 
+const auto mask = validate_handlers(handlers, Validate::Mode::Last);
 
 }  // namespace
 
 
 PyObject*
 Member::validate( CAtom* atom, PyObject* oldvalue, PyObject* newvalue )
 {
-    if( get_validate_mode() >= sizeof( handlers ) )
-        return no_op_handler( this, atom, oldvalue, newvalue );  // LCOV_EXCL_LINE
-    return handlers[ get_validate_mode() ]( this, atom, oldvalue, newvalue );
+    return handlers[ get_validate_mode() & mask ]( this, atom, oldvalue, newvalue );
 }