From e352772610e9dff16d81b267b91ba8db4149ad8c Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Mon, 8 Dec 2008 10:27:31 +0000 Subject: [PATCH] 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 --- auxprogs/libmpiwrap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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) -- 2.47.2