picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

assign environ to a temp variable to ensure liveness

Browse source
This commit is contained in:
Jude Taylor 2017-01-06 11:30:14 -08:00 committed by Eelco Dolstra
parent 8079ab87a2
commit c0d55f9183
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nix-build/nix-build.cc
View file

@ -446,10 +446,13 @@ int main(int argc, char ** argv)
? Strings{"bash", "--rcfile", rcfile}
: Strings{"bash", rcfile};
environ = stringsToCharPtrs(envStrs).data();
auto envPtrs = stringsToCharPtrs(envStrs);
execvp(getEnv("NIX_BUILD_SHELL", "bash").c_str(),
stringsToCharPtrs(args).data());
environ = envPtrs.data();
auto argPtrs = stringsToCharPtrs(args);
execvp(getEnv("NIX_BUILD_SHELL", "bash").c_str(), argPtrs.data());
throw SysError("executing shell");
}