svn commit: trunk/uClibc/libc/stdlib/malloc

vapier at uclibc.org vapier at uclibc.org
Tue Apr 24 05:24:09 UTC 2007


Author: vapier
Date: 2007-04-23 22:24:08 -0700 (Mon, 23 Apr 2007)
New Revision: 18515

Log:
fix from Bernd Schmidt for realloc shrinkage bug

Modified:
   trunk/uClibc/libc/stdlib/malloc/realloc.c


Changeset:
Modified: trunk/uClibc/libc/stdlib/malloc/realloc.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/realloc.c	2007-04-23 17:01:05 UTC (rev 18514)
+++ trunk/uClibc/libc/stdlib/malloc/realloc.c	2007-04-24 05:24:08 UTC (rev 18515)
@@ -46,6 +46,11 @@
      allocation unit (SIZE is already guaranteed to be so).*/
   new_size = HEAP_ADJUST_SIZE (new_size + MALLOC_HEADER_SIZE);
 
+  if (new_size < sizeof (struct heap_free_area))
+    /* Because we sometimes must use a freed block to hold a free-area node,
+       we must make sure that every allocated block can hold one.  */
+    new_size = HEAP_ADJUST_SIZE (sizeof (struct heap_free_area));
+
   MALLOC_DEBUG (1, "realloc: 0x%lx, %d (base = 0x%lx, total_size = %d)",
 		(long)mem, new_size, (long)base_mem, size);
 




More information about the uClibc-cvs mailing list