diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-08-25 12:35:52 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-08-25 12:35:52 +0000 |
| commit | 4d73c382ab83222c9ea10194e4270f1259c517b2 (patch) | |
| tree | 573c748083714962a2ee08b7f6e37167bc58a7c7 /cpukit/score/src/heapresizeblock.c | |
| parent | 2010-08-25 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-4d73c382ab83222c9ea10194e4270f1259c517b2.tar.bz2 | |
2010-08-25 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1672/cpukit
* score/include/rtems/score/heap.h, score/src/heap.c,
score/src/heapallocate.c, score/src/heapextend.c,
score/src/heapfree.c, score/src/heapresizeblock.c,
score/src/heapsizeofuserarea.c: Added heap protection in case
RTEMS_DEBUG is defined.
Diffstat (limited to 'cpukit/score/src/heapresizeblock.c')
| -rw-r--r-- | cpukit/score/src/heapresizeblock.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpukit/score/src/heapresizeblock.c b/cpukit/score/src/heapresizeblock.c index d684c84c26..152418fc71 100644 --- a/cpukit/score/src/heapresizeblock.c +++ b/cpukit/score/src/heapresizeblock.c @@ -42,7 +42,7 @@ static Heap_Resize_status _Heap_Resize_block_checked( uintptr_t block_size = _Heap_Block_size( block ); uintptr_t block_end = block_begin + block_size; - uintptr_t alloc_size = block_end - alloc_begin + HEAP_BLOCK_SIZE_OFFSET; + uintptr_t alloc_size = block_end - alloc_begin + HEAP_ALLOC_BONUS; Heap_Block *next_block = _Heap_Block_at( block, block_size ); uintptr_t next_block_size = _Heap_Block_size( next_block ); @@ -79,7 +79,7 @@ static Heap_Resize_status _Heap_Resize_block_checked( block_size = _Heap_Block_size( block ); next_block = _Heap_Block_at( block, block_size ); - *new_size = (uintptr_t) next_block - alloc_begin + HEAP_BLOCK_SIZE_OFFSET; + *new_size = (uintptr_t) next_block - alloc_begin + HEAP_ALLOC_BONUS; /* Statistics */ ++stats->resizes; @@ -104,6 +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 ) ) { return _Heap_Resize_block_checked( heap, |