Changes in uspace/lib/c/generic/malloc.c [ffccdff0:dd50aa19] in mainline

File:

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

uspace/lib/c/generic/malloc.c

@@ -34 +34 @@
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdalign.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <as.h>
 #include <align.h>
@@ -47 +48 @@
 #include <stdlib.h>
 #include <adt/gcdlcm.h>
+#include <malloc.h>
 
 #include "private/malloc.h"
@@ -724 +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);
@@ -773 +778 @@
 }
 
-/** Allocate memory by number of elements
- *
- * @param nmemb Number of members to allocate.
- * @param size  Size of one member in bytes.
- *
- * @return Allocated memory or NULL.
- *
- */
-void *calloc(const size_t nmemb, const size_t size)
-{
-        // FIXME: Check for overflow
-
-        void *block = malloc(nmemb * size);
-        if (block == NULL)
-                return NULL;
-
-        memset(block, 0, nmemb * size);
-        return block;
-}
-
 /** Allocate memory
  *
@@ -840 +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;
         }
 
@@ -949 +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
  *