From: Julian Seward <jseward@acm.org>
Date: Mon, 8 Dec 2008 10:27:31 +0000 (+0000)
Subject: Don't segfault the guest during a call MPI_Init(NULL,NULL), since
X-Git-Tag: svn/VALGRIND_3_4_0~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e352772610e9dff16d81b267b91ba8db4149ad8c;p=thirdparty%2Fvalgrind.git

Don't segfault the guest during a call MPI_Init(NULL,NULL), since
those are valid parameters to MPI_Init.



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

diff --git a/auxprogs/libmpiwrap.c b/auxprogs/libmpiwrap.c
index 10858c1f76..6369c986dc 100644
--- a/auxprogs/libmpiwrap.c
+++ b/auxprogs/libmpiwrap.c
@@ -2113,8 +2113,12 @@ long WRAPPER_FOR(PMPI_Init)(int *argc, char ***argv)
    int    err;
    VALGRIND_GET_ORIG_FN(fn);
    before("Init");
-   check_mem_is_defined_untyped(argc, sizeof(int));
-   check_mem_is_defined_untyped(*argv, *argc * sizeof(char**));
+   if (argc) {
+      check_mem_is_defined_untyped(argc, sizeof(int));
+   }
+   if (argc && argv) {
+      check_mem_is_defined_untyped(*argv, *argc * sizeof(char**));
+   }
    CALL_FN_W_WW(err, fn, argc,argv);
    after("Init", err);
    if (opt_initkludge)