Changeset 1749Tweet

Timestamp:

Feb 19, 2007, 11:28:16 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Use mmap() instead of malloc() in the mmap() reimplementation so that returned values are not in the heap.

File:

• zzuf/trunk/src/lib-mem.c (modified) (2 diffs)

zzuf/trunk/src/lib-mem.c

@@ -218 +218 @@
 #define MMAP(fn, off_t) \
     do { \
+        char *b = MAP_FAILED; \
         LOADSYM(fn); \
-        ret = ORIG(fn)(start, length, prot, flags, fd, offset); \
         if(!_zz_ready || !_zz_iswatched(fd) || _zz_islocked(fd)) \
-            return ret; \
-        if(ret && length) \
+            return ORIG(fn)(start, length, prot, flags, fd, offset); \
+        ret = ORIG(fn)(NULL, length, prot, flags, fd, offset); \
+        if(ret != MAP_FAILED && length) \
         { \
-            char *b = malloc(length); \
+            b = ORIG(fn)(start, length, PROT_READ | PROT_WRITE, \
+                         MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); \
+            if(b == MAP_FAILED) \
+            { \
+                munmap(ret, length); \
+                ret = MAP_FAILED; \
+            } \
+        } \
+        if(b != MAP_FAILED) \
+        { \
             int i, oldpos; \
             for(i = 0; i < nbmaps; i += 2) \
@@ -284 +294 @@
             continue;
 
-        free(start);
+        ORIG(munmap)(start, length);
         ret = ORIG(munmap)(maps[i + 1], length);
         maps[i] = NULL;