diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-07-24 09:29:46 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-07-24 09:29:46 +0000 |
| commit | 14e685c29d5b317b815e3e9f056648027852b07e (patch) | |
| tree | be251d64d02f91ebafddaf5f3c868399b17b3970 | |
| parent | 7ee7b225bd2fc3e7a3980f5fb7b10dfc6e205578 (diff) | |
unquote_first_word: parse ` '' ` as an empty argument instead of no argument
| -rw-r--r-- | src/basic/util.c | 14 | ||||
| -rw-r--r-- | src/test/test-util.c | 11 |
2 files changed, 21 insertions, 4 deletions
diff --git a/src/basic/util.c b/src/basic/util.c index a45f5f8e53..7d85324d07 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -5379,13 +5379,19 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) { case VALUE: if (c == 0) goto finish; - else if (c == '\'') + else if (c == '\'') { + if (!GREEDY_REALLOC(s, allocated, sz+1)) + return -ENOMEM; + state = SINGLE_QUOTE; - else if (c == '\\') + } else if (c == '\\') state = VALUE_ESCAPE; - else if (c == '\"') + else if (c == '\"') { + if (!GREEDY_REALLOC(s, allocated, sz+1)) + return -ENOMEM; + state = DOUBLE_QUOTE; - else if (strchr(WHITESPACE, c)) + } else if (strchr(WHITESPACE, c)) state = SPACE; else { if (!GREEDY_REALLOC(s, allocated, sz+2)) diff --git a/src/test/test-util.c b/src/test/test-util.c index 72fbc345c2..ab40f0076b 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -1518,6 +1518,17 @@ static void test_unquote_first_word(void) { assert_se(streq(t, "\\w+\b")); free(t); assert_se(p == original + 5); + + p = original = "-N ''"; + assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE) > 0); + assert_se(streq(t, "-N")); + free(t); + assert_se(p == original + 3); + + assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE) > 0); + assert_se(streq(t, "")); + free(t); + assert_se(p == original + 5); } static void test_unquote_first_word_and_warn(void) { |