Changeset 228 for trunk

Timestamp:

Apr 22, 2009, 5:32:03 PM (15 years ago)

Author:

katerina

Message:

Fix yet another NULL dereference segfault in dnmalloc on 64bit

File:

• trunk/src/dnmalloc.c (modified) (3 diffs)

trunk/src/dnmalloc.c

@@ -92 +92 @@
    Fail    on: OpenBSD/pthread (in  _thread_machdep_save_float_state),
                might be related to OpenBSD pthread internals (??).
-               Non-treaded version (#undef USE_MALLOC_LOC) 
+               Non-treaded version (#undef USE_MALLOC_LOCK) 
                works on OpenBSD.
    
@@ -101 +101 @@
    Minor cleanups
    Fix: eliminate prototypes for memset, memcpy (they're in string.h)
+   Fix: one more malloc_consolidate segfault
 
    There may be some bugs left in this version. please use with caution.
@@ -4406 +4407 @@
           /* consolidate forward */
           if (!inuse(nextchunk)) {
-            unlink(nextchunk, bck, fwd);
-            size += nextsize;
-            set_head(p, size | PREV_INUSE);
-            hashtable_skiprm(p, nextchunk);
-            freecilst_add (nextchunk);
+            /* if mmap is used instead of sbrk, we may have a
+             * chunk with !nextchunk->fd && !nextchunk->bk
+             */
+            if (nextchunk->fd && nextchunk->fd)
+              {
+                unlink(nextchunk, bck, fwd);
+                size += nextsize;
+                set_head(p, size | PREV_INUSE);
+                hashtable_skiprm(p, nextchunk);
+                freecilst_add (nextchunk);
+              }
           }