aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-06-07 14:28:30 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-06-07 14:28:30 +0300
commit3ea3b1c94f320bb55849d4a9fea1c3009ab3b298 (patch)
tree87469169e782bdff72b147ec2deef4884037b29f
parent7c4f5e6464a7d9a9c48b4d6773fbb348624cc32e (diff)
Fix process_env not to store storage
-rw-r--r--libbutl/process-run.txx5
-rw-r--r--libbutl/process.hxx1
2 files changed, 4 insertions, 2 deletions
diff --git a/libbutl/process-run.txx b/libbutl/process-run.txx
index d8b4847..54dceed 100644
--- a/libbutl/process-run.txx
+++ b/libbutl/process-run.txx
@@ -14,7 +14,10 @@ namespace butl
{
if (!v.empty ())
{
- process_args_as (vars_, v, storage_);
+ std::string storage;
+ process_args_as (vars_, v, storage);
+ assert (storage.empty ()); // We don't expect the storage to be used.
+
vars_.push_back (nullptr);
vars = vars_.data ();
}
diff --git a/libbutl/process.hxx b/libbutl/process.hxx
index 983cb32..4a1a9d0 100644
--- a/libbutl/process.hxx
+++ b/libbutl/process.hxx
@@ -480,7 +480,6 @@ namespace butl
private:
process_path path_;
small_vector<const char*, 3> vars_;
- std::string storage_;
};
template <typename I,