summaryrefslogtreecommitdiff
path: root/nix/libutil
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-19 08:02:52 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-19 16:09:58 +0200
commita88b8c5c985a87586159c0621974a1dfe5b9b92d (patch)
treede07afac97f3f3061bd75a13e83576f48284c225 /nix/libutil
parente53fc0c8a33b1ea4f8503aca899da34ff9ebaa3c (diff)
Revert "daemon: Fix possible use-after-free."
This reverts commit 1303a4a4517260def862ce7fe97e6b28dd8005e1.
Diffstat (limited to 'nix/libutil')
-rw-r--r--nix/libutil/util.cc20
-rw-r--r--nix/libutil/util.hh5
2 files changed, 6 insertions, 19 deletions
diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc
index 024cea83d1..846674a29d 100644
--- a/nix/libutil/util.cc
+++ b/nix/libutil/util.cc
@@ -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
diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh
index a70981877b..ce2d77c19a 100644
--- a/nix/libutil/util.hh
+++ b/nix/libutil/util.hh
@@ -257,11 +257,6 @@ void killUser(uid_t uid);
string runProgram(Path program, bool searchPath = false,
const Strings & args = Strings());
-/* Convert a list of strings to a null-terminated vector of char
- *'s. The result must not be accessed beyond the lifetime of the
- list of strings. */
-std::vector<const char *> stringsToCharPtrs(const Strings & ss);
-
/* Close all file descriptors except stdin, stdout, stderr, and those
listed in the given set. Good practice in child processes. */
void closeMostFDs(const set<int> & exceptions);