commit eb577d7ec674109215260d7ade34320527e45ffb
author florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Mon Sep 16 21:46:31 2013 +0000
committer florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Mon Sep 16 21:46:31 2013 +0000
tree f61e7a72d210ea3510ffc05de1c7d456d44bb23d
parent 1a046d5a3c34f924b648cc22c01f0a8e02ca221e

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


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13556 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/m_mallocfree.c

diff --git a/coregrind/m_mallocfree.c b/coregrind/m_mallocfree.c
index 69666bf..8cd324c 100644
--- a/coregrind/m_mallocfree.c
+++ b/coregrind/m_mallocfree.c
@@ -2200,7 +2200,8 @@
 
    p = VG_(arena_malloc) ( aid, cc, size );
 
-   VG_(memset)(p, 0, size);
+   if (p != NULL)
+     VG_(memset)(p, 0, size);
 
    return p;
 }