From 9c67231f3cc8151e7b9d471e6a53b1e487f83efa Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 13 May 2008 16:37:20 +0000 Subject: [PATCH] Manually merged revision 7895 from trunk to 3.3 branch. This fixes bugzilla item 161036. git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8063 --- exp-drd/drd_malloc_wrappers.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/exp-drd/drd_malloc_wrappers.c b/exp-drd/drd_malloc_wrappers.c index 205f473bcd..bd2366f440 100644 --- a/exp-drd/drd_malloc_wrappers.c +++ b/exp-drd/drd_malloc_wrappers.c @@ -39,7 +39,7 @@ /*------------------------------------------------------------*/ -/*--- Defns ---*/ +/*--- Definitions ---*/ /*------------------------------------------------------------*/ @@ -143,7 +143,9 @@ void drd_handle_free(ThreadId tid, Addr p) } 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); } } -- 2.47.2