Changeset 55d7626 in rtems for cpukit/score/src/heapfree.c

Timestamp:

07/11/07 20:56:10 (15 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

9190d236

Parents:

68b9f58

Message:

2007-07-11 Joel Sherrill <joel.sherrill@…>

• libcsupport/src/malloc.c: Clean up Malloc debug code.
• score/include/rtems/score/heap.h: Spacing.
• score/inline/rtems/score/thread.inl:
• score/src/heapfree.c. Clean up and add explicit check of the address being freed actually being in the heap.
• score/src/heapwalk.c: Switch to printk and do not call abort.

File:

• cpukit/score/src/heapfree.c (modified) (5 diffs)

cpukit/score/src/heapfree.c

@@ -2 +2 @@
  *  Heap Handler
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -41 +41 @@
 )
 {
-  Heap_Block        *the_block;
-  Heap_Block        *next_block;
+  Heap_Block      *the_block;
+  Heap_Block      *next_block;
   uint32_t         the_size;
   uint32_t         next_size;
   Heap_Statistics *const stats = &the_heap->stats;
-  boolean            next_is_free;
+  boolean          next_is_free;
+
+  if ( !_Addresses_Is_in_range(
+       starting_address, (void *)the_heap->start, (void *)the_heap->final ) ) {
+    _HAssert(starting_address != NULL);
+    return( FALSE );
+  }
 
   _Heap_Start_of_block( the_heap, starting_address, &the_block );
 
   if ( !_Heap_Is_block_in( the_heap, the_block ) ) {
-    _HAssert(starting_address == NULL);
-    _HAssert(FALSE);
+    _HAssert( FALSE );
     return( FALSE );
   }
@@ -60 +65 @@
 
   if ( !_Heap_Is_block_in( the_heap, next_block ) ) {
-    _HAssert(FALSE);
+    _HAssert( FALSE );
     return( FALSE );
   }
 
   if ( !_Heap_Is_prev_used( next_block ) ) {
-    _HAssert(FALSE);
+    _HAssert( FALSE );
     return( FALSE );
   }
@@ -78 +83 @@
 
     if ( !_Heap_Is_block_in( the_heap, prev_block ) ) {
-      _HAssert(FALSE);
+      _HAssert( FALSE );
       return( FALSE );
     }
@@ -85 +90 @@
        must have been used. */
     if ( !_Heap_Is_prev_used ( prev_block) ) {
-      _HAssert(FALSE);
+      _HAssert( FALSE );
       return( FALSE );
     }