From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Thu, 22 Oct 2015 00:37:32 +0000 (+0000)
Subject: util: allow unbalanced double quote in EXTRACT_QUOTES|EXTRACT_RELAX mode
X-Git-Tag: v228~168^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1642%2Fhead;p=thirdparty%2Fsystemd.git

util: allow unbalanced double quote in EXTRACT_QUOTES|EXTRACT_RELAX mode

extract_first_word understands "\'string" but doesn't understand "\"string"
fixed this inconsistency.
---

diff --git a/src/basic/util.c b/src/basic/util.c
index 3e90456dd3e..3989b415fa9 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -5913,9 +5913,11 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra
                         break;
 
                 case DOUBLE_QUOTE:
-                        if (c == 0)
+                        if (c == 0) {
+                                if (flags & EXTRACT_RELAX)
+                                        goto finish_force_terminate;
                                 return -EINVAL;
-                        else if (c == '\"')
+                        } else if (c == '\"')
                                 state = VALUE;
                         else if (c == '\\')
                                 state = DOUBLE_QUOTE_ESCAPE;
diff --git a/src/test/test-util.c b/src/test/test-util.c
index 503e8408034..b5d9d01ba0e 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1639,6 +1639,12 @@ static void test_extract_first_word(void) {
         free(t);
         assert_se(isempty(p));
 
+        p = original = "\"fooo";
+        assert_se(extract_first_word(&p, &t, NULL, EXTRACT_QUOTES|EXTRACT_RELAX) > 0);
+        assert_se(streq(t, "fooo"));
+        free(t);
+        assert_se(isempty(p));
+
         p = original = "yay\'foo\'bar";
         assert_se(extract_first_word(&p, &t, NULL, 0) > 0);
         assert_se(streq(t, "yay\'foo\'bar"));