From: José Fonseca Date: Thu, 30 May 2013 16:11:35 +0000 (+0100) Subject: cli: Prevent NULL pointer deref when trace verbose output is enabled. X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=c7d238675b2a3fd8d67bc2d8bc72b2ed0e07fec4;hp=d39581fd05b7569b2acf278e1339d63e5cbf34ff;p=apitrace cli: Prevent NULL pointer deref when trace verbose output is enabled. --- diff --git a/cli/cli_trace.cpp b/cli/cli_trace.cpp index f87a383..8c7f5b1 100644 --- a/cli/cli_trace.cpp +++ b/cli/cli_trace.cpp @@ -169,7 +169,6 @@ traceProgram(trace::API api, for (char * const * arg = argv; *arg; ++arg) { args.push_back(*arg); } - args.push_back(NULL); if (verbose) { const char *sep = ""; @@ -180,6 +179,8 @@ traceProgram(trace::API api, std::cerr << "\n"; } + args.push_back(NULL); + status = os::execute((char * const *)&args[0]); exit: