From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 13 May 2008 16:37:20 +0000 (+0000)
Subject: Manually merged revision 7895 from trunk to 3.3 branch. This fixes bugzilla item... 
X-Git-Tag: svn/VALGRIND_3_3_1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c67231f3cc8151e7b9d471e6a53b1e487f83efa;p=thirdparty%2Fvalgrind.git

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
---

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);
    }
 }