Changeset a22c62f in mainline for kernel/generic/src/mm/malloc.c

Timestamp:

2025-04-24T10:07:30Z (2 weeks ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

0460377, 1d93f77

Parents:

23d4e6ae

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-24 10:06:40)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-24 10:07:30)

Message:

Also ignore NULL passed to free()

File:

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

kernel/generic/src/mm/malloc.c

@@ -192 +192 @@
         void *obj = mem_alloc(alignof(max_align_t), size + _offset);
         if (!obj)
-           return NULL;
+                return NULL;
 
         obj += _offset;
@@ -209 +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);
+        }
 }