diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-11-23 14:59:05 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-11-23 14:59:05 +0000 |
| commit | 4e3d9b8a846f141621c4baa64707c895960b1154 (patch) | |
| tree | 6c7862718be72f0e64d3885e97b09f12720adc40 /cpukit | |
| parent | 2010-11-22 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-4e3d9b8a846f141621c4baa64707c895960b1154.tar.bz2 | |
2010-11-23 Sebastian Huber <sebastian.huber@embedded-brains.de>
* score/src/iterateoverthreads.c, libmisc/cpuuse/cpuusagereport.c:
Fixed NULL pointer access in case POSIX API is disabled.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/libmisc/cpuuse/cpuusagereport.c | 16 | ||||
| -rw-r--r-- | cpukit/score/src/iterateoverthreads.c | 8 |
3 files changed, 14 insertions, 15 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 99f04aff66..3ee1ccc9aa 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2010-11-23 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * score/src/iterateoverthreads.c, libmisc/cpuuse/cpuusagereport.c: + Fixed NULL pointer access in case POSIX API is disabled. + 2010-11-19 Sebastian Huber <sebastian.huber@embedded-brains.de> * libmisc/monitor/mon-monitor.c: Fixed broken monitor command list. diff --git a/cpukit/libmisc/cpuuse/cpuusagereport.c b/cpukit/libmisc/cpuuse/cpuusagereport.c index 79ac92e7b2..b46aab7c35 100644 --- a/cpukit/libmisc/cpuuse/cpuusagereport.c +++ b/cpukit/libmisc/cpuuse/cpuusagereport.c @@ -72,12 +72,10 @@ void rtems_cpu_usage_report_with_plugin( #else for ( api_index = 1 ; api_index <= OBJECTS_APIS_LAST ; api_index++ ) { /* - * Since the removal of ITRON, this cannot occur. + * Since POSIX is optional, this can occur. */ - #if defined(RTEMS_DEBUG) - if ( !_Objects_Information_table[ api_index ] ) - continue; - #endif + if ( !_Objects_Information_table[ api_index ] ) + continue; information = _Objects_Information_table[ api_index ][ 1 ]; if ( information ) { @@ -106,12 +104,10 @@ void rtems_cpu_usage_report_with_plugin( for ( api_index = 1 ; api_index <= OBJECTS_APIS_LAST ; api_index++ ) { /* - * Since the removal of ITRON, this cannot occur. + * Since POSIX is optional, this can occur. */ - #if defined(RTEMS_DEBUG) - if ( !_Objects_Information_table[ api_index ] ) - continue; - #endif + if ( !_Objects_Information_table[ api_index ] ) + continue; information = _Objects_Information_table[ api_index ][ 1 ]; if ( information ) { diff --git a/cpukit/score/src/iterateoverthreads.c b/cpukit/score/src/iterateoverthreads.c index 0cd8679f8d..34683e6790 100644 --- a/cpukit/score/src/iterateoverthreads.c +++ b/cpukit/score/src/iterateoverthreads.c @@ -34,12 +34,10 @@ void rtems_iterate_over_all_threads(rtems_per_thread_routine routine) for ( api_index = 1 ; api_index <= OBJECTS_APIS_LAST ; api_index++ ) { /* - * Since the removal of ITRON, this cannot occur. + * Since POSIX is optional, this can occur. */ - #if defined(RTEMS_DEBUG) - if ( !_Objects_Information_table[ api_index ] ) - continue; - #endif + if ( !_Objects_Information_table[ api_index ] ) + continue; information = _Objects_Information_table[ api_index ][ 1 ]; if ( !information ) |