Manually merged revision 7895 from trunk to 3.3 branch. This fixes bugzilla item...

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 205f473bcd5c6251f52f1c631fbad1868a1121b4..bd2366f440f7390ffa90cd43617d8aa46541ad98 100644 (file)
--- 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);
    }
 }