|
From: <sv...@va...> - 2008-05-13 16:37:37
|
Author: bart
Date: 2008-05-13 17:37:20 +0100 (Tue, 13 May 2008)
New Revision: 8063
Log:
Manually merged revision 7895 from trunk to 3.3 branch. This fixes bugzilla item 161036.
Modified:
branches/VALGRIND_3_3_BRANCH/exp-drd/drd_malloc_wrappers.c
Modified: branches/VALGRIND_3_3_BRANCH/exp-drd/drd_malloc_wrappers.c
===================================================================
--- branches/VALGRIND_3_3_BRANCH/exp-drd/drd_malloc_wrappers.c 2008-05-13 16:17:34 UTC (rev 8062)
+++ branches/VALGRIND_3_3_BRANCH/exp-drd/drd_malloc_wrappers.c 2008-05-13 16:37:20 UTC (rev 8063)
@@ -39,7 +39,7 @@
/*------------------------------------------------------------*/
-/*--- Defns ---*/
+/*--- Definitions ---*/
/*------------------------------------------------------------*/
@@ -143,7 +143,9 @@
}
else
{
+ tl_assert(p == mc->data);
s_stop_using_mem_callback(mc->data, mc->data + mc->size);
+ VG_(cli_free)((void*)p);
VG_(free)(mc);
}
}
|