Improve valgrind support when compiled with DEBUG_MEM

diff --git a/libdm/mm/dbg_malloc.c b/libdm/mm/dbg_malloc.c
index cf8330cf48102d2fc0ad767df185e4a3cb66be50..084932a20aa7c20b8e68284be27663c3ed2271d0 100644 (file)
--- a/libdm/mm/dbg_malloc.c
+++ b/libdm/mm/dbg_malloc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.  
- * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
  *
  * This file is part of the device-mapper userspace tools.
  *
@@ -15,6 +15,10 @@
 
 #include "dmlib.h"
 
+#ifdef VALGRIND_POOL
+#include "valgrind/memcheck.h"
+#endif
+
 #include <assert.h>
 #include <stdarg.h>
 
@@ -115,7 +119,9 @@ void *dm_malloc_aux_debug(size_t s, const char *file, int line)
 
        /* log_debug("Allocated: %u %u %u", nb->id, _mem_stats.blocks_allocated,
                  _mem_stats.bytes); */
-
+#ifdef VALGRIND_POOL
+       VALGRIND_MAKE_MEM_UNDEFINED(nb + 1, s);
+#endif
        return nb + 1;
 }
 
@@ -141,7 +147,9 @@ void dm_free_aux(void *p)
 
        /* sanity check */
        assert(mb->magic == p);
-
+#ifdef VALGRIND_POOL
+       VALGRIND_MAKE_MEM_DEFINED(p, mb->length);
+#endif
        /* check data at the far boundary */
        ptr = (char *) p + mb->length;
        for (i = 0; i < sizeof(unsigned long); i++)