RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Fix _Objects_Id_to_name()

Browse Source 
Avoid out-of-bounds array access in case the object class is invalid.
This commit is contained in:
Sebastian Huber
2016-05-03 09:12:51 +02:00
parent 1d40d81b4b
commit 0ab4fb7ca6
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cpukit/score/src/objectidtoname.c
View File

@@ -25,8 +25,6 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
Objects_Name *name Objects_Name *name
) )
{ {
uint32_t the_api;
uint32_t the_class;
Objects_Id tmpId; Objects_Id tmpId;
Objects_Information *information; Objects_Information *information;
Objects_Control *the_object = (Objects_Control *) 0; 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; tmpId = (id == OBJECTS_ID_OF_SELF) ? _Thread_Get_executing()->Object.id : id;
the_api = _Objects_Get_API( tmpId ); information = _Objects_Get_information_id( 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 ];
if ( !information ) if ( !information )
return OBJECTS_INVALID_ID; return OBJECTS_INVALID_ID;