Changeset 669

Timestamp:

Sep 9, 2003, 11:50:03 AM (22 years ago)

Author:

bird

Message:

* empty log message *

Location:

trunk/src/emx

Files:

• include/emx/umalloc.h (modified) (1 diff, 1 prop)
• src/lib/malloc/ifree.c (modified) (3 diffs, 1 prop)
• src/lib/malloc/irealloc.c (modified) (2 diffs, 1 prop)

trunk/src/emx/include/emx/umalloc.h

@@ -760 +760 @@
 
 
+static __inline__ void _um_abort (const char *pszmsg)
+{
+  /* Use the 'syscall' write for safest possible path. */
+  extern int __write (int handle, const void *buf, size_t nbytes); 
+  __write (2, "\r\n!_um_abort!", 13);
+  if (pszmsg)
+    {
+      const char *psz = pszmsg;
+      while (*psz) 
+        psz++;
+      __write (2, pszmsg, psz - pszmsg);
+    }
+  __write (2, "\r\n", 2);
+  __asm__ __volatile__ ("int $3");
+}
+
+
 #if defined (__cplusplus)
 }

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

@@ -40 +40 @@
       break;
   if (*patch == NULL)
-    abort ();
+    {
+      _um_abort ("Corrupt heap? (Patch not found.)");
+      return;
+    }
   *patch = crate->next;
 
@@ -123 +126 @@
   hdr = _HDR_FROM_BLOCK (block);
   if (_UM_HDR_STATUS (hdr) == _UMS_FREE)
-    abort ();
+    {
+      _um_abort ("Tried to free block twice! (free)");
+      return;
+    }
   parent = _PTR_FROM_UMINT (hdr->parent, _umagic);
   switch (*parent)
@@ -136 +142 @@
       break;
     default:
-      abort ();
+      _um_abort ("Corrupt heap or passing wrong pointer to free! (bad parent magic)");
+      return;
+
     }
 }

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

@@ -309 +309 @@
   hdr = _HDR_FROM_BLOCK (block);
   if (_UM_HDR_STATUS (hdr) == _UMS_FREE)
-    abort ();
+    {
+      _um_abort ("Tried to free block twice! (realloc)");
+      return NULL;
+    } 
   parent = _PTR_FROM_UMINT (hdr->parent, _umagic);
   switch (*parent)
@@ -323 +326 @@
                                align, flags);
     default:
-      abort ();
-    }
-}
+      {
+        _um_abort ("Corrupt heap or passing wrong pointer to realloc! (bad parent magic)");
+        return NULL;
+      }
+    }
+}