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 10858c1f76753376e3424b6bff0af3d75ac354a3..6369c986dcb9b1efb52d7e57e9248d911a5f892e 100644 (file)
--- 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)