lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-08 16:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix renderdoccmd -c on Linux

Browse Source 
* 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
This commit is contained in:
Chia-I Wu
2016-03-08 09:42:59 +08:00
parent 7aa561cc2d
commit d6c48c60ef
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/linux/linux_process.cpp
+8 -4
View File
@@ -83,8 +83,8 @@ 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;
@@ -92,7 +92,7 @@ static pid_t RunProcess(const char *app, const char *workingDir, const char *cmd
// 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)
{