|
From: <sv...@va...> - 2011-01-04 14:18:46
|
Author: sewardj
Date: 2011-01-04 14:18:35 +0000 (Tue, 04 Jan 2011)
New Revision: 11489
Log:
Un-break the trunk build on OSX (broken by r11483 on 6 Dec '10).
Fixes #261654.
Modified:
trunk/coregrind/m_syswrap/syswrap-darwin.c
Modified: trunk/coregrind/m_syswrap/syswrap-darwin.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-darwin.c 2010-12-17 00:45:19 UTC (rev 11488)
+++ trunk/coregrind/m_syswrap/syswrap-darwin.c 2011-01-04 14:18:35 UTC (rev 11489)
@@ -2749,7 +2749,13 @@
}
// Decide whether or not we want to follow along
- trace_this_child = VG_(should_we_trace_this_child)( (HChar*)ARG2 );
+ { // Make 'child_argv' be a pointer to the child's arg vector
+ // (skipping the exe name)
+ HChar** child_argv = (HChar**)ARG4;
+ if (child_argv && child_argv[0] == NULL)
+ child_argv = NULL;
+ trace_this_child = VG_(should_we_trace_this_child)( (HChar*)ARG2, child_argv );
+ }
// Do the important checks: it is a file, is executable, permissions are
// ok, etc. We allow setuid executables to run only in the case when
|