From 8911c2ffa55638d2ed69847f3f89e67dbfc052d9 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Wed, 4 May 2011 09:01:58 +0000 Subject: [PATCH] VG_(env_unsetenv), VG_(env_clone): add assertions so as to cause assertions instead of segfaults. Potential segfaults were detected by IBM's BEAM checker. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11721 --- coregrind/m_libcproc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/coregrind/m_libcproc.c b/coregrind/m_libcproc.c index e01f6129df..dbedac2ede 100644 --- a/coregrind/m_libcproc.c +++ b/coregrind/m_libcproc.c @@ -91,8 +91,10 @@ Char *VG_(getenv)(Char *varname) void VG_(env_unsetenv) ( Char **env, const Char *varname ) { - Char **from; - Char **to = NULL; + Char **from, **to; + vg_assert(env); + vg_assert(varname); + to = NULL; Int len = VG_(strlen)(varname); for (from = to = env; from && *from; from++) { @@ -302,6 +304,7 @@ Char **VG_(env_clone) ( Char **oldenv ) Char **newenv; Int envlen; + vg_assert(oldenv); for (oldenvp = oldenv; oldenvp && *oldenvp; oldenvp++); envlen = oldenvp - oldenv + 1; -- 2.47.2