Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-22 11:21:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

posix: Avoid NULL pointer access

Browse Source
This commit is contained in:
Sebastian Huber
2013-08-28 14:58:49 +02:00
parent 7d9fff6e28
commit 7bff82f34f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/posix/src/keyfreememory.c
+5 -3
View File
@@ -29,8 +29,10 @@ void _POSIX_Keys_Free_memory(
POSIX_Keys_Key_value_pair search_node;
POSIX_Keys_Key_value_pair *p;
RBTree_Node *iter, *next;
Objects_Id key_id;
search_node.key = the_key->Object.id;
key_id = the_key->Object.id;
search_node.key = key_id;
search_node.thread_id = 0;
iter = _RBTree_Find_unprotected( &_POSIX_Keys_Key_value_lookup_tree, &search_node.Key_value_lookup_node );
if ( !iter )
@@ -40,7 +42,7 @@ void _POSIX_Keys_Free_memory(
*/
next = _RBTree_Next_unprotected( iter, RBT_LEFT );
p = _RBTree_Container_of( next, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
while ( p->key == the_key->Object.id) {
while ( next != NULL && p->key == key_id) {
iter = next;
next = _RBTree_Next_unprotected( iter, RBT_LEFT );
p = _RBTree_Container_of( next, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
@@ -50,7 +52,7 @@ void _POSIX_Keys_Free_memory(
* delete all nodes belongs to the_key from the rbtree and chain.
*/
p = _RBTree_Container_of( iter, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
while ( p->key == the_key->Object.id ) {
while ( iter != NULL && p->key == key_id ) {
next = _RBTree_Next_unprotected( iter, RBT_RIGHT );
_RBTree_Extract_unprotected( &_POSIX_Keys_Key_value_lookup_tree, iter );
_Chain_Extract_unprotected( &p->Key_values_per_thread_node );