[rtems commit] score: Fix _Objects_Id_to_name()
Sebastian Huber
sebh at rtems.org
Wed May 4 05:25:21 UTC 2016
Module: rtems
Branch: master
Commit: 0ab4fb7ca60b62d2e54f8afa924062e87bef334e
Changeset: http://git.rtems.org/rtems/commit/?id=0ab4fb7ca60b62d2e54f8afa924062e87bef334e
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Tue May 3 09:12:51 2016 +0200
score: Fix _Objects_Id_to_name()
Avoid out-of-bounds array access in case the object class is invalid.
---
cpukit/score/src/objectidtoname.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/cpukit/score/src/objectidtoname.c b/cpukit/score/src/objectidtoname.c
index 674f641..9f50687 100644
--- a/cpukit/score/src/objectidtoname.c
+++ b/cpukit/score/src/objectidtoname.c
@@ -25,8 +25,6 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
Objects_Name *name
)
{
- uint32_t the_api;
- uint32_t the_class;
Objects_Id tmpId;
Objects_Information *information;
Objects_Control *the_object = (Objects_Control *) 0;
@@ -39,16 +37,7 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
tmpId = (id == OBJECTS_ID_OF_SELF) ? _Thread_Get_executing()->Object.id : id;
- the_api = _Objects_Get_API( tmpId );
- if ( !_Objects_Is_api_valid( the_api ) )
- return OBJECTS_INVALID_ID;
-
- if ( !_Objects_Information_table[ the_api ] )
- return OBJECTS_INVALID_ID;
-
- the_class = _Objects_Get_class( tmpId );
-
- information = _Objects_Information_table[ the_api ][ the_class ];
+ information = _Objects_Get_information_id( tmpId );
if ( !information )
return OBJECTS_INVALID_ID;
More information about the vc
mailing list