From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 15 Apr 2011 23:50:10 +0000 (+0200)
Subject: strv: detect non-assignments in env blocks properly in env_append()
X-Git-Tag: v25~37
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d6ab905c00342d012aed559a859b373512e4650;p=systemd

strv: detect non-assignments in env blocks properly in env_append()
---

diff --git a/src/strv.c b/src/strv.c
index c8ebb648..0afd9865 100644
--- a/src/strv.c
+++ b/src/strv.c
@@ -358,7 +358,10 @@ char **strv_remove(char **l, const char *s) {
         if (!l)
                 return NULL;
 
-        /* Drops every occurrence of s in the string list */
+        assert(s);
+
+        /* Drops every occurrence of s in the string list, edits
+         * in-place. */
 
         for (f = t = l; *f; f++) {
 
@@ -387,7 +390,12 @@ static int env_append(char **r, char ***k, char **a) {
 
         for (; *a; a++) {
                 char **j;
-                size_t n = strcspn(*a, "=") + 1;
+                size_t n;
+
+                n = strcspn(*a, "=");
+
+                if ((*a)[n] == '=')
+                        n++;
 
                 for (j = r; j < *k; j++)
                         if (strncmp(*j, *a, n) == 0)