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

score: PR2151: _Thread_queue_Extract_with_proxy()

Browse Source 
Avoid NULL pointer access.
This commit is contained in:
Sebastian Huber
2013-11-18 13:25:49 +01:00
parent 79e2d9b65e
commit 7552e77c96
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cpukit/score/src/threadqextractwithproxy.c
View File

@@ -31,28 +31,29 @@ bool _Thread_queue_Extract_with_proxy(
Thread_Control *the_thread Thread_Control *the_thread
) )
{ {
Thread_queue_Control *the_thread_queue;
#if defined(RTEMS_MULTIPROCESSING)
States_Control state; States_Control state;
state = the_thread->current_state; state = the_thread->current_state;
if ( _States_Is_waiting_on_thread_queue( state ) ) {
#if defined(RTEMS_MULTIPROCESSING)
if ( _States_Is_waiting_for_rpc_reply( state ) && if ( _States_Is_waiting_for_rpc_reply( state ) &&
_States_Is_locally_blocked( state ) ) { _States_Is_locally_blocked( state ) ) {
Objects_Information *the_information; Objects_Information *the_information;
Objects_Thread_queue_Extract_callout proxy_extract_callout; Objects_Thread_queue_Extract_callout proxy_extract_callout;
the_information = _Objects_Get_information_id( the_thread->Wait.id ); the_information = _Objects_Get_information_id( the_thread->Wait.id );
proxy_extract_callout = proxy_extract_callout = the_information->extract;
(Objects_Thread_queue_Extract_callout) the_information->extract;
if ( proxy_extract_callout ) if ( proxy_extract_callout != NULL )
(*proxy_extract_callout)( the_thread ); (*proxy_extract_callout)( the_thread );
} }
#endif #endif
_Thread_queue_Extract( the_thread->Wait.queue, the_thread );
return true; the_thread_queue = the_thread->Wait.queue;
} if ( the_thread_queue != NULL ) {
return _Thread_queue_Extract( the_thread_queue, the_thread );
} else {
return false; return false;
} }
}