Changeset 2156

Timestamp:

Jul 3, 2005, 12:03:14 AM (20 years ago)

Author:

bird

Message:

malloc and realloc must set errno to ENOMEM on failure.

Location:

trunk/src/emx/src/lib/malloc

Files:

• irealloc.c (modified) (3 diffs, 1 prop)
• umalloc.c (modified) (3 diffs, 1 prop)

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

@@ -10 +10 @@
 #include <sys/fmutex.h>
 #include <emx/umalloc.h>
+#include <errno.h>
 
 static void *_um_crumb_expand (struct _um_crate *crate,
@@ -297 +298 @@
   struct _um_hdr *hdr;
   _umagic *parent;
+  void *ret;
 
   if (block == NULL)
@@ -310 +312 @@
     {
       _um_abort ("Tried to free block twice! (realloc)");
+      errno = EINVAL;
       return NULL;
-    } 
+    }
   parent = _PTR_FROM_UMINT (hdr->parent, _umagic);
   switch (*parent)
     {
     case _UM_MAGIC_CRATE:
-      return _um_crumb_realloc ((struct _um_crate *)parent,
-                                _UM_CRUMB_FROM_BLOCK (block), new_size,
-                                align, flags);
+      ret = _um_crumb_realloc ((struct _um_crate *)parent,
+                               _UM_CRUMB_FROM_BLOCK (block), new_size,
+                               align, flags);
       break;
+
     case _UM_MAGIC_SEG:
-      return _um_lump_realloc ((struct _um_seg *)parent,
-                               _UM_LUMP_FROM_BLOCK (block), new_size,
-                               align, flags);
+      ret = _um_lump_realloc ((struct _um_seg *)parent,
+                              _UM_LUMP_FROM_BLOCK (block), new_size,
+                              align, flags);
+      break;
+
     default:
       {
         _um_abort ("Corrupt heap or passing wrong pointer to realloc! (bad parent magic)");
+        errno = EINVAL;
         return NULL;
       }
     }
-}
+  if (ret)
+    return ret;
+  errno = ENOMEM;
+  return NULL;
+}

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

@@ -9 +9 @@
 #include <sys/fmutex.h>
 #include <emx/umalloc.h>
+#include <errno.h>
 
 void *_umalloc (Heap_t h, size_t size)
@@ -18 +19 @@
   assert (h->magic == _UM_MAGIC_HEAP);
   if (h->magic != _UM_MAGIC_HEAP)
-    return NULL;
+    {
+      errno = EINVAL;
+      return NULL;
+    }
 
   _um_heap_lock (h);
@@ -26 +30 @@
   block = _um_alloc_no_lock (h, size, align, flags);
   _um_heap_unlock (h);
-  return block;
+  if (block)
+      return block;
+  errno = ENOMEM;
+  return NULL;
 }