amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "daemon: Fix possible use-after-free."

Browse source 
This reverts commit 1303a4a451.
This commit is contained in:
Ludovic Courtès 2015-05-19 08:02:52 +02:00
parent e53fc0c8a3
commit a88b8c5c98
3 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

20
nix/libutil/util.cc
View file

@ -852,20 +852,16 @@ void killUser(uid_t uid)
//////////////////////////////////////////////////////////////////////
std::vector<const char *> stringsToCharPtrs(const Strings & ss)
{
std::vector<const char *> res;
foreach (Strings::const_iterator, i, ss)
res.push_back(i->c_str());
res.push_back(0);
return res;
}
string runProgram(Path program, bool searchPath, const Strings & args)
{
checkInterrupt();
std::vector<const char *> cargs; /* careful with c_str()! */
cargs.push_back(program.c_str());
for (Strings::const_iterator i = args.begin(); i != args.end(); ++i)
cargs.push_back(i->c_str());
cargs.push_back(0);
/* Create a pipe. */
Pipe pipe;
pipe.create();
@ -884,10 +880,6 @@ string runProgram(Path program, bool searchPath, const Strings & args)
if (dup2(pipe.writeSide, STDOUT_FILENO) == -1)
throw SysError("dupping stdout");
Strings args_(args);
args_.push_front(program);
auto cargs = stringsToCharPtrs(args_);
if (searchPath)
execvp(program.c_str(), (char * *) &cargs[0]);
else