7e66102f7
Denys Vlasenko
2015-02-05
Subject
ash: fix a SEGV case in an invalid heredoc
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash.c +11 -4shell/ash_test/ash-heredoc/heredoc1.right +1 -0shell/ash_test/ash-heredoc/heredoc1.tests +3 -0
shell/ash.c+11 -4
| @@ -10556,7 +10556,7 @@ static union node *andor(void); | |
| static union node *pipeline(void); | |
| static union node *parse_command(void); | |
| static void parseheredoc(void); | |
| - | static char peektoken(void); |
| + | static char nexttoken_ends_list(void); |
| static int readtoken(void); | |
| static union node * | |
| @@ -10566,7 +10566,7 @@ list(int nlflag) | |
| int tok; | |
| checkkwd = CHKNL | CHKKWD | CHKALIAS; | |
| - | if (nlflag == 2 && peektoken()) |
| + | if (nlflag == 2 && nexttoken_ends_list()) |
| return NULL; | |
| n1 = NULL; | |
| for (;;) { | |
| @@ -10608,8 +10608,15 @@ list(int nlflag) | |
| tokpushback = 1; | |
| } | |
| checkkwd = CHKNL | CHKKWD | CHKALIAS; | |
| - | if (peektoken()) |
| + | if (nexttoken_ends_list()) { |
| + | /* Testcase: "<<EOF; then <W". |
| + | * It used to segfault w/o this check: |
| + | */ |
| + | if (heredoclist) { |
| + | raise_error_unexpected_syntax(-1); |
| + | } |
| return n1; | |
| + | } |
| break; | |
| case TEOF: | |
| if (heredoclist) | |
| @@ -12046,7 +12053,7 @@ readtoken(void) | |
| } | |
| static char | |
| - | peektoken(void) |
| + | nexttoken_ends_list(void) |
| { | |
| int t; | |
shell/ash_test/ash-heredoc/heredoc1.right+1 -0
| @@ -0,0 +1 @@ | |
| + | heredoc1.tests: line 3: syntax error: unexpected "then" |
shell/ash_test/ash-heredoc/heredoc1.tests+3 -0
| @@ -0,0 +1,3 @@ | |
| + | # We used to SEGV on this: |
| + | |
| + | <<EOF; then <W |