Don't assert if execve fails. Fixes bug #110875.

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

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 6f9f981fd77ffdbed26e6d500abf263481d250ec..b8045b9e4fc2d9ef7636a5e499bbce3f64817680 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -2412,8 +2412,9 @@ PRE(sys_execve)
 
    /* If we got here, then the execve failed.  We've already made too
       much of a mess of ourselves to continue, so we have to abort. */
+   vg_assert(FAILURE);
    VG_(message)(Vg_UserMsg, "execve(%p(%s), %p, %p) failed, errno %d",
-                ARG1, ARG1, ARG2, ARG3, -RES);
+                ARG1, ARG1, ARG2, ARG3, RES_unchecked);
    VG_(message)(Vg_UserMsg, "EXEC FAILED: I can't recover from "
                             "execve() failing, so I'm dying.");
    VG_(message)(Vg_UserMsg, "Add more stringent tests in PRE(sys_execve), "