ahill/toybox
1
0
Fork 0
mirror of https://codeberg.org/landley/toybox.git synced 2026-01-26 14:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix another case found by Eric Roshan-Eisner's fuzzing.

Browse Source
This commit is contained in:
Rob Landley 2023-01-11 13:27:31 -06:00
parent 687490a30d
commit 58b42b2384
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/sh.test
View File

@ -79,6 +79,8 @@ testing 'arg shift' "$SH -c '"'for i in "" 2 1 1 1; do echo $? $1; shift $i; don
testing '(subshell)' '$SH -c "(echo hello)"' 'hello\n' '' ''
testing 'syntax' '$SH -c "if true; then echo hello | fi" 2>/dev/null || echo x'\
'x\n' '' ''
testing 'syntax2' '$SH -c "for;i 0" 2>&1 | { grep -qi syntax && echo yes; }' \
'yes\n' '' ''
# The bash man page is lying when it says $_ starts with an absolute path.
ln -s "$(which $SH)" bash

7
toys/pending/sh.c
View File

@ -3176,6 +3176,9 @@ static int parse_line(char *line, struct sh_pipeline **ppl,
} else if (strchr(";|&", *s) && strncmp(s, "&>", 2)) {
arg->c--;
// Connecting nonexistent statements is an error
if (!arg->c || !smemcmp(ex, "do\0A", 4)) goto flush;
// treat ; as newline so we don't have to check both elsewhere.
if (!strcmp(s, ";")) {
arg->v[arg->c] = 0;
@ -3186,16 +3189,12 @@ static int parse_line(char *line, struct sh_pipeline **ppl,
// ;; and friends only allowed in case statements
} else if (*s == ';') goto flush;
// Connecting nonexistent statements is an error
if (!arg->c) goto flush;
pl->count = -1;
continue;
// a for/select must have at least one additional argument on same line
} else if (ex && !smemcmp(ex, "do\0A", 4)) {
// Sanity check and break the segment
if (strncmp(s, "((", 2) && *varend(s)) goto flush;
pl->count = -1;