Changeset 843

Timestamp:

Oct 27, 2003, 9:16:47 AM (22 years ago)

Author:

bird

Message:

#716,#608: Fixed bad defaul heap queries. (calloc() crash if called prior to main().)

Location:

trunk/src/emx/src/lib/malloc

Files:

• calloc.c (modified) (1 diff, 1 prop)
• heapchk.c (modified) (1 diff, 1 prop)
• heapset.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/lib/malloc/calloc.c

@@ -14 +14 @@
 {
   _UM_MT_DECL
+  Heap_t    heap_reg = _UM_DEFAULT_REGULAR_HEAP;
 
-  if (_UM_DEFAULT_REGULAR_HEAP == NULL)
-    _um_init_default_regular_heap ();
-  return _ucalloc (_UM_DEFAULT_REGULAR_HEAP, count, size);
+  if (heap_reg == NULL)
+    heap_reg = _um_init_default_regular_heap ();
+  return _ucalloc (heap_reg, count, size);
 }

trunk/src/emx/src/lib/malloc/heapchk.c

@@ -35 +35 @@
      heap, return the regular heap's status. */
 
-  if (_UM_DEFAULT_REGULAR_HEAP == _UM_DEFAULT_TILED_HEAP
-      || _UM_DEFAULT_TILED_HEAP == NULL)
+  if (heap_reg == heap_tiled || heap_tiled == NULL)
     return rc1;
 

trunk/src/emx/src/lib/malloc/heapset.c

@@ -15 +15 @@
   _UM_MT_DECL
   int rc1, rc2;
+  Heap_t    heap_reg = _UM_DEFAULT_REGULAR_HEAP;
+  Heap_t    heap_tiled = _UM_DEFAULT_TILED_HEAP;
 
   /* Initialize the heap pointers, in case _heapset() is called by a
@@ -20 +22 @@
 
   if (_UM_DEFAULT_REGULAR_HEAP == NULL)
-    _um_init_default_regular_heap ();
+    heap_reg = _um_init_default_regular_heap ();
   if (_UM_DEFAULT_TILED_HEAP == NULL)
-    _um_init_default_tiled_heap ();
+    heap_tiled = _um_init_default_tiled_heap ();
 
   /* First fill the regular heap. */
 
-  rc1 = _uheapset (_UM_DEFAULT_REGULAR_HEAP, fill);
+  rc1 = _uheapset (heap_reg, fill);
   if (rc1 != _HEAPOK && rc1 != _HEAPEMPTY)
     return rc1;
@@ -33 +35 @@
      heap, return the regular heap's status. */
 
-  if (_UM_DEFAULT_REGULAR_HEAP == _UM_DEFAULT_TILED_HEAP
-      || _UM_DEFAULT_TILED_HEAP == NULL)
+  if (heap_reg == heap_tiled || heap_tiled == NULL)
     return rc1;
 
@@ -40 +41 @@
      heaps is non-empty. */
 
-  rc2 = _uheapset (_UM_DEFAULT_TILED_HEAP, fill);
+  rc2 = _uheapset (heap_tiled, fill);
   if (rc2 == _HEAPEMPTY)
     return rc1;