diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-10 14:49:01 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-10 14:49:01 +0200 |
| commit | 4709df0f152c477c191f83e18bfecabb2fb2c1f9 (patch) | |
| tree | fa94cad09f55f5a46c8bb793637278b62f2a4b6d | |
| parent | bcf56114fa7f037cea579cdc8d17ac1a5dab93a3 (diff) | |
| download | busybox-4709df0f152c477c191f83e18bfecabb2fb2c1f9.tar.gz | |
hush: fix handling of \<eof> in double-quoted strings
function old new delta
encode_string 268 250 -18
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | shell/hush.c | 11 | ||||
| -rw-r--r-- | shell/hush_test/hush-parsing/bkslash_eof2.right | 2 | ||||
| -rwxr-xr-x | shell/hush_test/hush-parsing/bkslash_eof2.tests | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/shell/hush.c b/shell/hush.c index 5df8d4744..98ba96e0c 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -4913,11 +4913,12 @@ static int encode_string(o_string *as_string, ch, ch, !!(dest->o_expflags & EXP_FLAG_ESC_GLOB_CHARS)); if (process_bkslash && ch == '\\') { if (next == EOF) { -// TODO: what if in interactive shell a file with -// echo "unterminated string\<eof> -// is sourced? - syntax_error("\\<eof>"); - xfunc_die(); + /* Testcase: in interactive shell a file with + * echo "unterminated string\<eof> + * is sourced. + */ + syntax_error_unterm_ch('"'); + return 0; /* error */ } /* bash: * "The backslash retains its special meaning [in "..."] diff --git a/shell/hush_test/hush-parsing/bkslash_eof2.right b/shell/hush_test/hush-parsing/bkslash_eof2.right new file mode 100644 index 000000000..8be75727f --- /dev/null +++ b/shell/hush_test/hush-parsing/bkslash_eof2.right @@ -0,0 +1,2 @@ +hush: syntax error: unterminated " +One:1 diff --git a/shell/hush_test/hush-parsing/bkslash_eof2.tests b/shell/hush_test/hush-parsing/bkslash_eof2.tests new file mode 100755 index 000000000..da1f08db6 --- /dev/null +++ b/shell/hush_test/hush-parsing/bkslash_eof2.tests @@ -0,0 +1,4 @@ +printf 'echo "unterminated string\\' >test.tmp.sh +. ./test.tmp.sh +echo One:$? +rm -f test.tmp.sh |