Changeset 664Tweet

Timestamp:

Mar 22, 2006, 6:34:03 PM (17 years ago)

Author:

Sam Hocevar

Message:

• Handle malloc(0), realloc(NULL,...) and realloc(...,0) in kernel mode.

File:

• libcaca/trunk/kernel/kernel.c (modified) (2 diffs)

libcaca/trunk/kernel/kernel.c

@@ -56 +56 @@
 {
     uint32_t *p = freemem;
+    if(!size)
+        return NULL;
     size = (size + 0x7) / 4;
     *p = size;
@@ -69 +71 @@
 void *realloc(void *ptr, size_t size)
 {
-   uint32_t oldsize = ((uint32_t *)ptr)[-1];
+    uint32_t oldsize;
     void *p;
-    if(oldsize >= size)
-        return ptr;
+
+    if(!size)
+        return NULL;
+
+    if(!ptr)
+        oldsize = 0;
+    else
+    {
+        oldsize = ((uint32_t *)ptr)[-1];
+        if(oldsize >= size)
+            return ptr;
+    }
 
     p = malloc(size);