Changes in kernel/generic/src/mm/malloc.c [0a2c96c:a22c62f] in mainline

File:

• kernel/generic/src/mm/malloc.c (modified) (3 diffs)

kernel/generic/src/mm/malloc.c

@@ -34 +34 @@
 #include <bitops.h>
 #include <mm/slab.h>
-#include <mem.h>
+#include <memw.h>
 #include <main/main.h> // malloc_init()
 #include <macros.h>
@@ -190 +190 @@
                 return NULL;
 
-        void *obj = mem_alloc(alignof(max_align_t), size + _offset) + _offset;
+        void *obj = mem_alloc(alignof(max_align_t), size + _offset);
+        if (!obj)
+                return NULL;
+
+        obj += _offset;
 
         /* Remember the allocation size just before the object. */
@@ -205 +209 @@
          * slab_free() will detect it and panic.
          */
-        size_t size = ((size_t *) obj)[-1];
-        mem_free(obj - _offset, alignof(max_align_t), size + _offset);
+        if (obj) {
+                size_t size = ((size_t *) obj)[-1];
+                mem_free(obj - _offset, alignof(max_align_t), size + _offset);
+        }
 }
 
 void *realloc(void *old_obj, size_t new_size)
 {
+        if (new_size == 0)
+                new_size = 1;
+
         if (!old_obj)
                 return malloc(new_size);