VG_(memset) cannot handle NULL pointers and needs to be guarded.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13556

diff --git a/coregrind/m_mallocfree.c b/coregrind/m_mallocfree.c
index 69666bf0eb1a97c4357ffd84daf8fb018c2a4e91..8cd324c563c954b04571589d434f7d0effae2654 100644 (file)
--- a/coregrind/m_mallocfree.c
+++ b/coregrind/m_mallocfree.c
@@ -2200,7 +2200,8 @@ void* VG_(arena_calloc) ( ArenaId aid, const HChar* cc,
 
    p = VG_(arena_malloc) ( aid, cc, size );
 
-   VG_(memset)(p, 0, size);
+   if (p != NULL)
+     VG_(memset)(p, 0, size);
 
    return p;
 }