diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-01-25 14:07:40 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-01-25 14:07:40 +0100 |
| commit | cba79a87f86f4f8d3c5b21ff7024b392402cf287 (patch) | |
| tree | 02f18db88a950e77a471960aa3147ca87ab9f2a0 /shell/hush.c | |
| parent | 0ca3198f9333b363ced46bfabf51c0d6b111c875 (diff) | |
hush: fix two corner cases in ${v/pattern/repl}. Closes 10686
function old new delta
expand_one_var 1592 1618 +26
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush.c')
| -rw-r--r-- | shell/hush.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c index a9183c82f..cf3c731bc 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -5643,6 +5643,10 @@ static char *replace_pattern(char *val, const char *pattern, const char *repl, c unsigned res_len = 0; unsigned repl_len = strlen(repl); + /* Null pattern never matches, including if "var" is empty */ + if (!pattern[0]) + return result; /* NULL, no replaces happened */ + while (1) { int size; char *s = strstr_pattern(val, pattern, &size); @@ -5809,8 +5813,6 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha * and if // is used, it is encoded as \: * var\pattern<SPECIAL_VAR_SYMBOL>repl<SPECIAL_VAR_SYMBOL> */ - /* Empty variable always gives nothing: */ - // "v=''; echo ${v/*/w}" prints "", not "w" if (val && val[0]) { /* pattern uses non-standard expansion. * repl should be unbackslashed and globbed @@ -5846,6 +5848,13 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha val = to_be_freed; free(pattern); free(repl); + } else { + /* Empty variable always gives nothing */ + // "v=''; echo ${v/*/w}" prints "", not "w" + /* Just skip "replace" part */ + *p++ = SPECIAL_VAR_SYMBOL; + p = strchr(p, SPECIAL_VAR_SYMBOL); + *p = '\0'; } } #endif /* BASH_PATTERN_SUBST */ |