Changeset 1646 for zzuf/trunkTweet

Timestamp:

Jan 10, 2007, 7:11:13 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Allow several calls to malloc()/calloc() in the library preloading stage.

File:

• zzuf/trunk/src/load-mem.c (modified) (5 diffs)

zzuf/trunk/src/load-mem.c

@@ -109 +109 @@
 /* 32k of ugly static memory for programs that call us *before* we’re
  * initialised */
-uint64_t dummy_buffer[4096];
+static uint64_t dummy_buffer[4096];
+static int dummy_offset = 0;
 
 void *calloc(size_t nmemb, size_t size)
@@ -116 +117 @@
     if(!_zz_ready)
     {
+        int i = (nmemb * size + 7) / 8;
+        ret = dummy_buffer + dummy_offset;
+        dummy_offset += i;
         /* Calloc says we must zero the data */
-        int i = (nmemb * size + 7) / 8;
-        while(i--)
-            dummy_buffer[i] = 0;
-        return dummy_buffer;
+        memset(ret, 0, size);
+        return ret;
     }
     ret = calloc_orig(nmemb, size);
@@ -132 +134 @@
     void *ret;
     if(!_zz_ready)
-        return dummy_buffer;
+    {
+        int i = (size + 7) / 8;
+        ret = dummy_buffer + dummy_offset;
+        dummy_offset += i;
+        return ret;
+    }
     ret = malloc_orig(size);
     if(ret == NULL && _zz_memory && errno == ENOMEM)
@@ -141 +148 @@
 void free(void *ptr)
 {
-    if(ptr == dummy_buffer)
+    if((uintptr_t)ptr >= (uintptr_t)dummy_buffer
+       && (uintptr_t)ptr <= (uintptr_t)dummy_buffer + sizeof(dummy_buffer))
         return;
     if(!_zz_ready)
@@ -151 +159 @@
 {
     void *ret;
-    if(ptr == dummy_buffer)
-        return ptr;
+    if((uintptr_t)ptr >= (uintptr_t)dummy_buffer
+       && (uintptr_t)ptr <= (uintptr_t)dummy_buffer + sizeof(dummy_buffer))
+        return ptr; /* FIXME: who would call realloc() so early? */
     if(!_zz_ready)
         LOADSYM(realloc);