Changeset ebb1489 in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/lib/c/generic/malloc.c (modified) (4 diffs)

uspace/lib/c/generic/malloc.c

@@ -38 +38 @@
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <as.h>
 #include <align.h>
@@ -725 +726 @@
  *
  */
-static void *malloc_internal(const size_t size, const size_t align)
+static void *malloc_internal(size_t size, size_t align)
 {
         malloc_assert(first_heap_area != NULL);
 
+        if (size == 0)
+                size = 1;
+
         if (align == 0)
-                return NULL;
+                align = BASE_ALIGN;
 
         size_t falign = lcm(align, BASE_ALIGN);
@@ -821 +825 @@
  *
  */
-void *realloc(void *const addr, const size_t size)
+void *realloc(void *const addr, size_t size)
 {
         if (size == 0) {
-                free(addr);
-                return NULL;
+                fprintf(stderr, "realloc() called with size 0\n");
+                size = 1;
         }
 
@@ -930 +934 @@
 }
 
+/** Reallocate memory for an array
+ *
+ * Same as realloc(ptr, nelem * elsize), except the multiplication is checked
+ * for numerical overflow. Borrowed from POSIX 2024.
+ *
+ * @param ptr
+ * @param nelem
+ * @param elsize
+ *
+ * @return Reallocated memory or NULL.
+ */
+void *reallocarray(void *ptr, size_t nelem, size_t elsize)
+{
+        if (nelem > SIZE_MAX / elsize)
+                return NULL;
+
+        return realloc(ptr, nelem * elsize);
+}
+
 /** Free a memory block
  *