Changeset 2354 for zzuf/trunk/srcTweet

Timestamp:

Jun 10, 2008, 6:21:17 PM (13 years ago)

Author:

Sam Hocevar

Message:

• Do not try to free() on buffers that have been allocated with the real malloc, or we may crash unexpectedly, for instance if dlsym("free") calls malloc() then free() while free hasn't been loaded yet.

Location:

zzuf/trunk/src

Files:

• lib-mem.c (modified) (2 diffs)
• libzzuf.c (modified) (1 diff)

zzuf/trunk/src/lib-mem.c

@@ -111 +111 @@
 void _zz_mem_init(void)
 {
+    LOADSYM(free);
     LOADSYM(calloc);
     LOADSYM(malloc);
@@ -157 +158 @@
         return;
     }
-    LOADSYM(free);
+    if(!ORIG(free))
+    {
+        /* FIXME: memory leak */
+        debug("%s(%p) IGNORED", __func__, ptr);
+        return;
+    }
     ORIG(free)(ptr);
 }

zzuf/trunk/src/libzzuf.c

@@ -103 +103 @@
     char *tmp, *tmp2;
 
-    /* We need this as soon as possible */
-    _zz_mem_init();
-
     tmp = getenv("ZZUF_DEBUG");
     if(tmp)
         _zz_debugfd = atoi(tmp);
+
+    /* We need this as soon as possible */
+    _zz_mem_init();
 
     tmp = getenv("ZZUF_SEED");