2006-12-18 Jeff Johnston <jjohnstn@redhat.com>

        * libc/stdlib/mallocr.c (malloc_extend_top): Add patch from
        2.6.5 version of Doug Lea's malloc which is the basis of
        this code.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f33be08e7bb412818ebd7861e2c0183f33718692..58d896cfa0e465b763a2106926a2b10b6bc804e5 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,14 @@
+2006-12-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * libc/stdlib/mallocr.c (malloc_extend_top): Add patch from
+       2.6.5 version of Doug Lea's malloc which is the basis of
+       this code.
+
+2006-12-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * aclocal.m4 */aclocal.m4: Regenerated using aclocal 1.9.6.
+       * Makefile.in */Makefile.in: Regenerated using automake 1.9.6.
+
 2006-12-18  Kazunori Asayama <asayama@sm.sony.co.jp>
 
        * libc/include/machine/setjmp.h[__SPU__]: Replace vector with __vector.

diff --git a/newlib/libc/stdlib/mallocr.c b/newlib/libc/stdlib/mallocr.c
index cfa25545ffe4e6cd1f38144ef978994e3d893c56..e7cdace22d36540d0845d7df88b4560cc729976b 100644 (file)
--- a/newlib/libc/stdlib/mallocr.c
+++ b/newlib/libc/stdlib/mallocr.c
@@ -2223,11 +2223,11 @@ static void malloc_extend_top(RARG nb) RDECL INTERNAL_SIZE_T nb;
 
       /* Also keep size a multiple of MALLOC_ALIGNMENT */
       old_top_size = (old_top_size - 3*SIZE_SZ) & ~MALLOC_ALIGN_MASK;
-      set_head_size(old_top, old_top_size);
       chunk_at_offset(old_top, old_top_size          )->size =
         SIZE_SZ|PREV_INUSE;
       chunk_at_offset(old_top, old_top_size + SIZE_SZ)->size =
         SIZE_SZ|PREV_INUSE;
+      set_head_size(old_top, old_top_size);
       /* If possible, release the rest. */
       if (old_top_size >= MINSIZE) 
         fREe(RCALL chunk2mem(old_top));