From 29c20eaeb04ec0f42b9e4dc8d198b54b8b01745e Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Wed, 4 May 2011 09:07:38 +0000 Subject: [PATCH] setup_client_stack: use have_exename to consistently guard uses of VG_(args_the_exename), thereby avoiding a potential segfault. Spotted by IBM's BEAM checker. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11724 --- coregrind/m_initimg/initimg-linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coregrind/m_initimg/initimg-linux.c b/coregrind/m_initimg/initimg-linux.c index 4b9f0dd7a0..3250343b50 100644 --- a/coregrind/m_initimg/initimg-linux.c +++ b/coregrind/m_initimg/initimg-linux.c @@ -456,7 +456,7 @@ Addr setup_client_stack( void* init_sp, stringsize += VG_(strlen)(cauxv->u.a_ptr) + 1; else if (cauxv->a_type == AT_RANDOM) stringsize += 16; - else if (cauxv->a_type == AT_EXECFN) + else if (cauxv->a_type == AT_EXECFN && have_exename) stringsize += VG_(strlen)(VG_(args_the_exename)) + 1; auxsize += sizeof(*cauxv); } -- 2.47.2