Correct handler range checks

frmdstryr · frmdstryr · commit 888d7104c540 · 2025-01-21T09:14:44.000-05:00
diff --git a/atom/src/behaviors.h b/atom/src/behaviors.h
@@ -14,7 +14,7 @@ namespace atom
 namespace GetAttr
 {
 
-enum Mode
+enum Mode: uint8_t
 {
     NoOp,
     Slot,
@@ -37,7 +37,7 @@ enum Mode
 namespace PostGetAttr
 {
 
-enum Mode
+enum Mode: uint8_t
 {
     NoOp,
     Delegate,
@@ -53,7 +53,7 @@ enum Mode
 namespace SetAttr
 {
 
-enum Mode
+enum Mode: uint8_t
 {
     NoOp,
     Slot,
@@ -77,7 +77,7 @@ enum Mode
 namespace PostSetAttr
 {
 
-enum Mode
+enum Mode: uint8_t
 {
     NoOp,
     Delegate,
@@ -94,7 +94,7 @@ enum Mode
 namespace DefaultValue
 {
 
-enum Mode
+enum Mode: uint8_t
 {
     NoOp,
     Static,
@@ -119,7 +119,7 @@ enum Mode
 namespace Validate
 {
 
-enum Mode
+enum Mode: uint8_t
 {
     NoOp,
     Bool,
@@ -162,7 +162,7 @@ enum Mode
 namespace PostValidate
 {
 
-enum Mode
+enum Mode: uint8_t
 {
     NoOp,
     Delegate,
@@ -178,7 +178,7 @@ enum Mode
 namespace DelAttr
 {
 
-enum Mode
+enum Mode: uint8_t
 {
     NoOp,
     Slot,
@@ -197,7 +197,7 @@ enum Mode
 namespace GetState
 {
 
-enum Mode
+enum Mode: uint8_t
 {
     Include,  // We want include to be the default behavior
     Exclude,
diff --git a/atom/src/defaultvaluebehavior.cpp b/atom/src/defaultvaluebehavior.cpp
@@ -202,19 +202,19 @@ handlers[] = {
     call_object_object_name_handler,
     object_method_handler,
     object_method_name_handler,
-    member_method_object_handler
+    member_method_object_handler,
+    no_op_handler
 };
 
+static_assert( sizeof(handlers) / sizeof(handler) == 0xF, "Must be exactly 15 handlers" );
 
 }  // 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() & 0xF ]( this, atom );
 }
 
 
diff --git a/atom/src/delattrbehavior.cpp b/atom/src/delattrbehavior.cpp
@@ -189,19 +189,25 @@ handlers[] = {
     event_handler,
     signal_handler,
     delegate_handler,
-    property_handler
+    property_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler
 };
 
+static_assert( sizeof(handlers) / sizeof(handler) == 0xf, "Must be exactly 15 handlers" );
 
 }  // 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() & 0xf ]( this, atom );
 }
 
 
diff --git a/atom/src/getattrbehavior.cpp b/atom/src/getattrbehavior.cpp
@@ -256,18 +256,21 @@ 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
 };
 
+static_assert( sizeof(handlers) / sizeof(handler) == 0xf, "Must be exactly 15 handlers" );
+
 }  // 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() & 0xf ]( this, atom );
 }
 
 }  // namespace atom
diff --git a/atom/src/getstatebehavior.cpp b/atom/src/getstatebehavior.cpp
@@ -124,18 +124,27 @@ handlers[] = {
     include_non_default_handler,
     property_handler,
     object_method_name_handler,
-    member_method_object_handler
+    member_method_object_handler,
+    include_handler,
+    include_handler,
+    include_handler,
+    include_handler,
+    include_handler,
+    include_handler,
+    include_handler,
+    include_handler,
+    include_handler
 };
 
+static_assert( sizeof(handlers) / sizeof(handler) == 0xf, "Must be exactly 15 handlers" );
+
 }  // 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() & 0xf ]( this, atom );
 }
 
 }  // namespace atom
diff --git a/atom/src/postgetattrbehavior.cpp b/atom/src/postgetattrbehavior.cpp
@@ -93,19 +93,28 @@ 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,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler
 };
 
+static_assert( sizeof(handlers) / sizeof(handler) == 0xf, "Must be exactly 15 handlers" );
 
 }  // 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() & 0xf ]( this, atom, value );
 }
 
 
diff --git a/atom/src/postsetattrbehavior.cpp b/atom/src/postsetattrbehavior.cpp
@@ -106,19 +106,28 @@ 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,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler
 };
 
+static_assert( sizeof(handlers) / sizeof(handler) == 0xf, "Must be exactly 15 handlers" );
 
 }  // 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() & 0xf ]( this, atom, oldvalue, newvalue );
 }
 
 
diff --git a/atom/src/postvalidatebehavior.cpp b/atom/src/postvalidatebehavior.cpp
@@ -97,19 +97,28 @@ 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,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler,
+    no_op_handler
 };
 
+static_assert( sizeof(handlers) / sizeof(handler) == 0xf, "Must be exactly 15 handlers" );
 
 }  // 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() & 0xf ]( this, atom, oldvalue, newvalue );
 }
 
 }  // namespace atom
diff --git a/atom/src/setattrbehavior.cpp b/atom/src/setattrbehavior.cpp
@@ -377,19 +377,20 @@ 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
 };
 
+static_assert( sizeof(handlers) / sizeof(handler) == 0xf, "Must be exactly 15 handlers" );
 
 } // 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() & 0xf ]( this, atom, value );
 }
 
 
diff --git a/atom/src/validatebehavior.cpp b/atom/src/validatebehavior.cpp
@@ -1007,7 +1007,7 @@ handlers[] = {
 PyObject*
 Member::validate( CAtom* atom, PyObject* oldvalue, PyObject* newvalue )
 {
-    if( get_validate_mode() >= sizeof( handlers ) )
+    if( get_validate_mode() >= sizeof( handlers ) / sizeof( handler ) )
         return no_op_handler( this, atom, oldvalue, newvalue );  // LCOV_EXCL_LINE
     return handlers[ get_validate_mode() ]( this, atom, oldvalue, newvalue );
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace atom`
`14`	`14`	`namespace GetAttr`
`15`	`15`	`{`
`16`	`16`
`17`		`-enum Mode`
	`17`	`+enum Mode: uint8_t`
`18`	`18`	`{`
`19`	`19`	`NoOp,`
`20`	`20`	`Slot,`
`@@ -37,7 +37,7 @@ enum Mode`
`37`	`37`	`namespace PostGetAttr`
`38`	`38`	`{`
`39`	`39`
`40`		`-enum Mode`
	`40`	`+enum Mode: uint8_t`
`41`	`41`	`{`
`42`	`42`	`NoOp,`
`43`	`43`	`Delegate,`
`@@ -53,7 +53,7 @@ enum Mode`
`53`	`53`	`namespace SetAttr`
`54`	`54`	`{`
`55`	`55`
`56`		`-enum Mode`
	`56`	`+enum Mode: uint8_t`
`57`	`57`	`{`
`58`	`58`	`NoOp,`
`59`	`59`	`Slot,`
`@@ -77,7 +77,7 @@ enum Mode`
`77`	`77`	`namespace PostSetAttr`
`78`	`78`	`{`
`79`	`79`
`80`		`-enum Mode`
	`80`	`+enum Mode: uint8_t`
`81`	`81`	`{`
`82`	`82`	`NoOp,`
`83`	`83`	`Delegate,`
`@@ -94,7 +94,7 @@ enum Mode`
`94`	`94`	`namespace DefaultValue`
`95`	`95`	`{`
`96`	`96`
`97`		`-enum Mode`
	`97`	`+enum Mode: uint8_t`
`98`	`98`	`{`
`99`	`99`	`NoOp,`
`100`	`100`	`Static,`
`@@ -119,7 +119,7 @@ enum Mode`
`119`	`119`	`namespace Validate`
`120`	`120`	`{`
`121`	`121`
`122`		`-enum Mode`
	`122`	`+enum Mode: uint8_t`
`123`	`123`	`{`
`124`	`124`	`NoOp,`
`125`	`125`	`Bool,`
`@@ -162,7 +162,7 @@ enum Mode`
`162`	`162`	`namespace PostValidate`
`163`	`163`	`{`
`164`	`164`
`165`		`-enum Mode`
	`165`	`+enum Mode: uint8_t`
`166`	`166`	`{`
`167`	`167`	`NoOp,`
`168`	`168`	`Delegate,`
`@@ -178,7 +178,7 @@ enum Mode`
`178`	`178`	`namespace DelAttr`
`179`	`179`	`{`
`180`	`180`
`181`		`-enum Mode`
	`181`	`+enum Mode: uint8_t`
`182`	`182`	`{`
`183`	`183`	`NoOp,`
`184`	`184`	`Slot,`
`@@ -197,7 +197,7 @@ enum Mode`
`197`	`197`	`namespace GetState`
`198`	`198`	`{`
`199`	`199`
`200`		`-enum Mode`
	`200`	`+enum Mode: uint8_t`
`201`	`201`	`{`
`202`	`202`	`Include, // We want include to be the default behavior`
`203`	`203`	`Exclude,`
Original file line number	Diff line number	Diff line change
`@@ -1007,7 +1007,7 @@ handlers[] = {`
`1007`	`1007`	`PyObject*`
`1008`	`1008`	`Member::validate( CAtom* atom, PyObject* oldvalue, PyObject* newvalue )`
`1009`	`1009`	`{`
`1010`		`- if( get_validate_mode() >= sizeof( handlers ) )`
	`1010`	`+ if( get_validate_mode() >= sizeof( handlers ) / sizeof( handler ) )`
`1011`	`1011`	`return no_op_handler( this, atom, oldvalue, newvalue ); // LCOV_EXCL_LINE`
`1012`	`1012`	`return handlers[ get_validate_mode() ]( this, atom, oldvalue, newvalue );`
`1013`	`1013`	`}`