diff options
| author | Chris Johns <chrisj@rtems.org> | 2011-03-01 05:29:26 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2011-03-01 05:29:26 +0000 |
| commit | 678b206fd8a798a9564dfffc2cfd1aadfb4a777f (patch) | |
| tree | cb9bade71217ecaabfd966fcae1412f0f57bccd3 /cpukit/score/src/heapresizeblock.c | |
| parent | 2011-02-28 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-678b206fd8a798a9564dfffc2cfd1aadfb4a777f.tar.bz2 | |
2011-03-01 Chris Johns <chrisj@rtems.org>
* score/src/heapfree.c, score/src/heapresizeblock.c: PR 1746. Move
protection block checks to after the block address has been
checked as a valid heap address. Add a special case in the heap
free for a NULL address.
Diffstat (limited to '')
| -rw-r--r-- | cpukit/score/src/heapresizeblock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpukit/score/src/heapresizeblock.c b/cpukit/score/src/heapresizeblock.c index 152418fc71..2d3528645f 100644 --- a/cpukit/score/src/heapresizeblock.c +++ b/cpukit/score/src/heapresizeblock.c @@ -104,9 +104,8 @@ Heap_Resize_status _Heap_Resize_block( *old_size = 0; *new_size = 0; - _Heap_Protection_block_check( heap, block ); - if ( _Heap_Is_block_in_heap( heap, block ) ) { + _Heap_Protection_block_check( heap, block ); return _Heap_Resize_block_checked( heap, block, @@ -115,7 +114,6 @@ Heap_Resize_status _Heap_Resize_block( old_size, new_size ); - } else { - return HEAP_RESIZE_FATAL_ERROR; } + return HEAP_RESIZE_FATAL_ERROR; } |