From 54ac349445341503b1651c17b21495039d818a82 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 27 Oct 2016 21:15:59 -0400
Subject: core/load-fragment: modify existing environment instead of copying
 strv over and over

---
 src/core/load-fragment.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/core')

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 455c11a501..75c048a23e 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2240,7 +2240,6 @@ int config_parse_environ(const char *unit,
 
         for (p = rvalue;; ) {
                 _cleanup_free_ char *word = NULL, *k = NULL;
-                char **x;
 
                 r = extract_first_word(&p, &word, NULL, EXTRACT_CUNESCAPE|EXTRACT_QUOTES);
                 if (r == 0)
@@ -2271,12 +2270,10 @@ int config_parse_environ(const char *unit,
                         continue;
                 }
 
-                x = strv_env_set(*env, k);
-                if (!x)
+                r = strv_env_replace(env, k);
+                if (r < 0)
                         return log_oom();
-
-                strv_free(*env);
-                *env = x;
+                k = NULL;
         }
 }
 
-- 
cgit v1.2.3-54-g00ecf