From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 22 Jan 2017 21:23:24 +0000 (-0500)
Subject: basic/strv: allow NULLs to be inserted into strv
X-Git-Tag: v233.3~94
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7e146110e342b54dba8065d850f931025bd4738e;p=elogind.git

basic/strv: allow NULLs to be inserted into strv

All callers of this function insert non-empty strings, so there's no functional
change.
---

diff --git a/src/basic/strv.c b/src/basic/strv.c
index c98e956fd..4d3cce826 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -572,9 +572,6 @@ int strv_extend_front(char ***l, const char *value) {
 
         /* Like strv_extend(), but prepends rather than appends the new entry */
 
-        if (!value)
-                return 0;
-
         n = strv_length(*l);
 
         /* Increase and overflow check. */
@@ -582,9 +579,12 @@ int strv_extend_front(char ***l, const char *value) {
         if (m < n)
                 return -ENOMEM;
 
-        v = strdup(value);
-        if (!v)
-                return -ENOMEM;
+        if (value) {
+                v = strdup(value);
+                if (!v)
+                        return -ENOMEM;
+        } else
+                v = NULL;
 
         c = realloc_multiply(*l, sizeof(char*), m);
         if (!c) {