guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

158/376: fix disappearing bash arguments


From: Ludovic Courtès
Subject: 158/376: fix disappearing bash arguments
Date: Wed, 28 Jan 2015 22:04:43 +0000

civodul pushed a commit to tag 1.8
in repository guix.

commit b224ac15201c57b40ea855f5a98b1bd166c1c7f6
Author: Joel Taylor <address@hidden>
Date:   Thu Aug 21 14:06:49 2014 -0700

    fix disappearing bash arguments
---
 src/libstore/build.cc |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index b64c32d..c547a5c 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2133,8 +2133,13 @@ void DerivationGoal::initChild()
         /* Fill in the arguments. */
         string builderBasename = baseNameOf(drv.builder);
         args.push_back(builderBasename.c_str());
-        foreach (Strings::iterator, i, drv.args)
-            args.push_back(rewriteHashes(*i, rewritesToTmp).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);
 
         restoreSIGPIPE();



reply via email to

[Prev in Thread] Current Thread [Next in Thread]