diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2015-08-30 19:16:50 -0700 |
|---|---|---|
| committer | Filipe Brandenburger <filbranden@google.com> | 2015-08-30 19:48:30 -0700 |
| commit | d3ef6c5560613fe98fcd227b0256ab4af6078ad0 (patch) | |
| tree | aa518a08ff230ea10fa31348293b7a751dd56773 | |
| parent | 40ec276fdfc98f9fa7ed155b906235a79711066d (diff) | |
extract_first_word: Refactor allocation in empty argument case
This covers the case where an argument is an empty string, such as ''.
Instead of allocating the empty string in the individual conditions when
state == VALUE, just always allocate it at the end of state == START, at
which point we know we will have an argument.
Tested that test-util keeps passing after the refactor.
Follow up to: 14e685c29d5b317b815e3e9f056648027852b07e
| -rw-r--r-- | src/basic/util.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/basic/util.c b/src/basic/util.c index f752595ca1..fc0f000848 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -5769,25 +5769,25 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra break; } + /* We found a non-blank character, so we will always + * want to return a string (even if it is empty), + * allocate it here. */ + if (!GREEDY_REALLOC(s, allocated, sz+1)) + return -ENOMEM; + state = VALUE; /* fallthrough */ case VALUE: if (c == 0) goto finish_force_terminate; - else if (c == '\'' && (flags & EXTRACT_QUOTES)) { - if (!GREEDY_REALLOC(s, allocated, sz+1)) - return -ENOMEM; - + else if (c == '\'' && (flags & EXTRACT_QUOTES)) state = SINGLE_QUOTE; - } else if (c == '\\') + else if (c == '\\') state = VALUE_ESCAPE; - else if (c == '\"' && (flags & EXTRACT_QUOTES)) { - if (!GREEDY_REALLOC(s, allocated, sz+1)) - return -ENOMEM; - + else if (c == '\"' && (flags & EXTRACT_QUOTES)) state = DOUBLE_QUOTE; - } else if (strchr(separators, c)) { + else if (strchr(separators, c)) { if (flags & EXTRACT_DONT_COALESCE_SEPARATORS) { (*p) ++; goto finish_force_next; |