[rtems commit] objectimpl.h: Add _Assert() to _Objects_Invalidate_Id()

Joel Sherril joel at rtems.org
Wed Nov 26 13:55:51 UTC 2014


Module:    rtems
Branch:    master
Commit:    c562d0c9b0118e1154c290dc83397c0828a7de48
Changeset: http://git.rtems.org/rtems/commit/?id=c562d0c9b0118e1154c290dc83397c0828a7de48

Author:    Josh Oguin <josh.oguin at oarcorp.com>
Date:      Wed Nov 19 14:47:57 2014 -0600

objectimpl.h: Add _Assert() to _Objects_Invalidate_Id()

CodeSonar flagged this as a possible NULL deference. This should never
occur but adding the _Assert() ensures we are guarding against that.

---

 cpukit/score/include/rtems/score/objectimpl.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/cpukit/score/include/rtems/score/objectimpl.h
index 4e626ae..2928eff 100644
--- a/cpukit/score/include/rtems/score/objectimpl.h
+++ b/cpukit/score/include/rtems/score/objectimpl.h
@@ -875,6 +875,9 @@ RTEMS_INLINE_ROUTINE void _Objects_Invalidate_Id(
   Objects_Control      *the_object
 )
 {
+  _Assert( information != NULL );
+  _Assert( the_object != NULL );
+
   _Objects_Set_local_object(
     information,
     _Objects_Get_index( the_object->id ),
@@ -896,6 +899,9 @@ RTEMS_INLINE_ROUTINE void _Objects_Open(
   Objects_Name         name
 )
 {
+  _Assert( information != NULL );
+  _Assert( the_object != NULL );
+
   the_object->name = name;
 
   _Objects_Set_local_object(



More information about the vc mailing list