Ticket #1746: pr1746-head-heap-fix.diff

cpukit/score/src/heapfree.c

@@ -108 +108 @@
 bool _Heap_Free( Heap_Control *heap, void *alloc_begin_ptr )
 {
   Heap_Statistics *const stats = &heap->stats;
-  uintptr_t alloc_begin = (uintptr_t) alloc_begin_ptr;
-  Heap_Block *block =
-    _Heap_Block_of_alloc_area( alloc_begin, heap->page_size );
+  uintptr_t alloc_begin;
+  Heap_Block *block;
   Heap_Block *next_block = NULL;
   uintptr_t block_size = 0;
   uintptr_t next_block_size = 0;
   bool next_is_free = false;
 
-  _Heap_Protection_block_check( heap, block );
-
+  alloc_begin = (uintptr_t) alloc_begin_ptr;
+  block = _Heap_Block_of_alloc_area( alloc_begin, heap->page_size );
+  
   if ( !_Heap_Is_block_in_heap( heap, block ) ) {
     return false;
   }
 
+  _Heap_Protection_block_check( heap, block );
+
   block_size = _Heap_Block_size( block );
   next_block = _Heap_Block_at( block, block_size );
 
-  _Heap_Protection_block_check( heap, next_block );
-
   if ( !_Heap_Is_block_in_heap( heap, next_block ) ) {
-    _HAssert( false );
     return false;
   }
 
+  _Heap_Protection_block_check( heap, next_block );
+
   if ( !_Heap_Is_prev_used( next_block ) ) {
     _Heap_Protection_block_error( heap, block );
-
     return false;
   }
 

cpukit/score/src/heapresizeblock.c

@@ -104 +104 @@
   *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 +114 @@
       old_size,
       new_size
     );
-  } else {
-    return HEAP_RESIZE_FATAL_ERROR;
   }
+  return HEAP_RESIZE_FATAL_ERROR;
 }