Fix renderdoccmd -c on Linux

olvaffe · olvaffe · commit d6c48c60effb · 2016-03-08T11:51:05.000+08:00
* argv[0] should always be set up
* log an error when execve fails
* logfile is always NULL and constructing a std::string from NULL throws
* really apply EnvironmentModification
diff --git a/renderdoc/os/linux/linux_process.cpp b/renderdoc/os/linux/linux_process.cpp
@@ -83,16 +83,16 @@ static pid_t RunProcess(const char *app, const char *workingDir, const char *cmd
 {
 	if(!app) return (pid_t)0;
 
-	int argc = 0;
-	char *emptyargv[] = { NULL };
+	// it is safe to use app directly as execve never modifies argv
+	char *emptyargv[] = { (char *) app, NULL };
 	char **argv = emptyargv;
 
 	const char *c = cmdLine;
 
 	// parse command line into argv[], similar to how bash would
 	if(cmdLine)
 	{
-		argc = 1;
+		int argc = 1;
 
 		// get a rough upper bound on the number of arguments
 		while(*c)
@@ -212,6 +212,7 @@ static pid_t RunProcess(const char *app, const char *workingDir, const char *cmd
 		}
 
 		execve(app, argv, envp);
+		RDCERR("Failed to execute %s: %s", app, strerror(errno));
 		exit(0);
 	}
 	
@@ -261,6 +262,9 @@ uint32_t Process::LaunchAndInjectIntoProcess(const char *app, const char *workin
 	map<string, string> env = EnvStringToEnvMap((const char **)environ);
 	vector<EnvironmentModification> &modifications = GetEnvModifications();
 	
+	if (logfile == NULL)
+		logfile = "";
+
 	string libpath;
 	{
 		FileIO::GetExecutableFilename(libpath);
@@ -287,7 +291,7 @@ uint32_t Process::LaunchAndInjectIntoProcess(const char *app, const char *workin
 	{
 		EnvironmentModification &m = modifications[i];
 
-		string value = env[m.name];
+		string &value = env[m.name];
 
 		switch(m.type)
 		{

Original file line number	Diff line number	Diff line change
`@@ -83,16 +83,16 @@ static pid_t RunProcess(const char app, const char workingDir, const char *cmd`
`83`	`83`	`{`
`84`	`84`	`if(!app) return (pid_t)0;`
`85`	`85`
`86`		`- int argc = 0;`
`87`		`- char *emptyargv[] = { NULL };`
	`86`	`+ // it is safe to use app directly as execve never modifies argv`
	`87`	`+ char emptyargv[] = { (char ) app, NULL };`
`88`	`88`	`char **argv = emptyargv;`
`89`	`89`
`90`	`90`	`const char *c = cmdLine;`
`91`	`91`
`92`	`92`	`// parse command line into argv[], similar to how bash would`
`93`	`93`	`if(cmdLine)`
`94`	`94`	`{`
`95`		`- argc = 1;`
	`95`	`+ int argc = 1;`
`96`	`96`
`97`	`97`	`// get a rough upper bound on the number of arguments`
`98`	`98`	`while(*c)`
`@@ -212,6 +212,7 @@ static pid_t RunProcess(const char app, const char workingDir, const char *cmd`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`execve(app, argv, envp);`
	`215`	`+ RDCERR("Failed to execute %s: %s", app, strerror(errno));`
`215`	`216`	`exit(0);`
`216`	`217`	`}`
`217`	`218`
`@@ -261,6 +262,9 @@ uint32_t Process::LaunchAndInjectIntoProcess(const char app, const char workin`
`261`	`262`	`map<string, string> env = EnvStringToEnvMap((const char **)environ);`
`262`	`263`	`vector<EnvironmentModification> &modifications = GetEnvModifications();`
`263`	`264`
	`265`	`+ if (logfile == NULL)`
	`266`	`+ logfile = "";`
	`267`	`+`
`264`	`268`	`string libpath;`
`265`	`269`	`{`
`266`	`270`	`FileIO::GetExecutableFilename(libpath);`
`@@ -287,7 +291,7 @@ uint32_t Process::LaunchAndInjectIntoProcess(const char app, const char workin`
`287`	`291`	`{`
`288`	`292`	`EnvironmentModification &m = modifications[i];`
`289`	`293`
`290`		`- string value = env[m.name];`
	`294`	`+ string &value = env[m.name];`
`291`	`295`
`292`	`296`	`switch(m.type)`
`293`	`297`	`{`