[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
355/376: Fix some memory leaks
From: |
Ludovic Courtès |
Subject: |
355/376: Fix some memory leaks |
Date: |
Wed, 28 Jan 2015 22:06:09 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit f52b6c944e90b3e35925122779175705fdc02e12
Author: Eelco Dolstra <address@hidden>
Date: Fri Dec 12 15:01:16 2014 +0100
Fix some memory leaks
---
src/libstore/build.cc | 38 +++++++++-----------------------------
src/libutil/util.cc | 19 +++++++++++++------
src/libutil/util.hh | 5 +++++
3 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 1ae2427..0153666 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -415,18 +415,6 @@ static void commonChildInit(Pipe & logPipe)
}
-/* Convert a string list to an array of char pointers. Careful: the
- string list should outlive the array. */
-const char * * strings2CharPtrs(const Strings & ss)
-{
- const char * * arr = new const char * [ss.size() + 1];
- const char * * p = arr;
- foreach (Strings::const_iterator, i, ss) *p++ = i->c_str();
- *p = 0;
- return arr;
-}
-
-
//////////////////////////////////////////////////////////////////////
@@ -2124,11 +2112,7 @@ void DerivationGoal::runChild()
Strings envStrs;
foreach (Environment::const_iterator, i, env)
envStrs.push_back(rewriteHashes(i->first + "=" + i->second,
rewritesToTmp));
- const char * * envArr = strings2CharPtrs(envStrs);
-
- Path program = drv.builder.c_str();
- std::vector<const char *> args; /* careful with c_str()! */
- string user; /* must be here for its c_str()! */
+ auto envArr = stringsToCharPtrs(envStrs);
/* If we are running in `build-users' mode, then switch to the
user we allocated above. Make sure that we drop all root
@@ -2152,16 +2136,12 @@ void DerivationGoal::runChild()
}
/* Fill in the arguments. */
+ Strings args;
string builderBasename = baseNameOf(drv.builder);
- args.push_back(builderBasename.c_str());
- foreach (Strings::iterator, i, drv.args) {
- auto re = rewriteHashes(*i, rewritesToTmp);
- auto cstr = new char[re.length()+1];
- std::strcpy(cstr, re.c_str());
-
- args.push_back(cstr);
- }
- args.push_back(0);
+ args.push_back(builderBasename);
+ foreach (Strings::iterator, i, drv.args)
+ args.push_back(rewriteHashes(*i, rewritesToTmp));
+ auto argArr = stringsToCharPtrs(args);
restoreSIGPIPE();
@@ -2169,7 +2149,7 @@ void DerivationGoal::runChild()
writeFull(STDERR_FILENO, "\n");
/* Execute the program. This should not return. */
- execve(program.c_str(), (char * *) &args[0], (char * *) envArr);
+ execve(drv.builder.c_str(), (char * *) &argArr[0], (char * *)
&envArr[0]);
throw SysError(format("executing ‘%1%’") % drv.builder);
@@ -2797,7 +2777,7 @@ void SubstitutionGoal::tryToRun()
args.push_back("--substitute");
args.push_back(storePath);
args.push_back(destPath);
- const char * * argArr = strings2CharPtrs(args);
+ auto argArr = stringsToCharPtrs(args);
/* Fork the substitute program. */
pid = startProcess([&]() {
@@ -2807,7 +2787,7 @@ void SubstitutionGoal::tryToRun()
if (dup2(outPipe.writeSide, STDOUT_FILENO) == -1)
throw SysError("cannot dup output pipe into stdout");
- execv(sub.c_str(), (char * *) argArr);
+ execv(sub.c_str(), (char * *) &argArr[0]);
throw SysError(format("executing ‘%1%’") % sub);
});
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 1f71f76..dcdb438 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -912,16 +912,19 @@ pid_t startProcess(std::function<void()> fun, const
ProcessOptions & options)
}
+std::vector<const char *> stringsToCharPtrs(const Strings & ss)
+{
+ std::vector<const char *> res;
+ for (auto & s : ss) res.push_back(s.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();
@@ -931,6 +934,10 @@ 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/src/libutil/util.hh b/src/libutil/util.hh
index 352b83e..186ee71 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -289,6 +289,11 @@ string runProgram(Path program, bool searchPath = false,
MakeError(ExecError, Error)
+/* 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);
- 346/376: Don't use ?=, (continued)
- 346/376: Don't use ?=, Ludovic Courtès, 2015/01/28
- 347/376: Remove canary stuff, Ludovic Courtès, 2015/01/28
- 348/376: Remove dead code, Ludovic Courtès, 2015/01/28
- 350/376: Doh, Ludovic Courtès, 2015/01/28
- 338/376: Don't wait for PID -1, Ludovic Courtès, 2015/01/28
- 352/376: Get rid of unnecessary "interrupted by the user" message with -vvv, Ludovic Courtès, 2015/01/28
- 353/376: Don't abort if we get a signal while waiting for the pager, Ludovic Courtès, 2015/01/28
- 351/376: Remove chatty message, Ludovic Courtès, 2015/01/28
- 356/376: Shut up a Valgrind warning, Ludovic Courtès, 2015/01/28
- 349/376: Remove tabs, Ludovic Courtès, 2015/01/28
- 355/376: Fix some memory leaks,
Ludovic Courtès <=
- 357/376: Silence some warnings on GCC 4.9, Ludovic Courtès, 2015/01/28
- 358/376: Install cacert before running nix-channel, Ludovic Courtès, 2015/01/28
- 359/376: Better error message, Ludovic Courtès, 2015/01/28
- 362/376: Undocument nix-generate-patches, Ludovic Courtès, 2015/01/28
- 367/376: Fix image in PDF, Ludovic Courtès, 2015/01/28
- 354/376: Ensure we're writing to stderr in the builder, Ludovic Courtès, 2015/01/28
- 360/376: Style, Ludovic Courtès, 2015/01/28
- 365/376: Update .nixpkg description, Ludovic Courtès, 2015/01/28
- 366/376: Rename files, Ludovic Courtès, 2015/01/28
- 371/376: Merge commit '36c67860363c93eb00cf5b8e2ad34f6f775e6901', Ludovic Courtès, 2015/01/28