aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2015-10-29 11:30:22 +0000
committerDenys Vlasenko <vda.linux@googlemail.com>2015-10-29 21:42:30 +0100
commit6bd2fabc52fa76b69a65772878e2e745c0fff3ff (patch)
tree1ea2f98ad16dd7199e0a311d951078c0c40ea1fb
parent713f07d906d9171953be0c12e2369869855b6ca6 (diff)
downloadbusybox-6bd2fabc52fa76b69a65772878e2e745c0fff3ff.tar.gz
Revert "ash: fix a SEGV case in an invalid heredoc" xxx
This reverts commit 7e66102f762a7d80715f0c7e5925433256b78cee but leaves the test in place as it's still valid. Reported-by: Natanael Copa <ncopa@alpinelinux.org> Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/ash.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 384c7b9e4..72fc7d524 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10524,7 +10524,7 @@ static union node *andor(void);
static union node *pipeline(void);
static union node *parse_command(void);
static void parseheredoc(void);
-static char nexttoken_ends_list(void);
+static char peektoken(void);
static int readtoken(void);
static union node *
@@ -10534,7 +10534,7 @@ list(int nlflag)
int tok;
checkkwd = CHKNL | CHKKWD | CHKALIAS;
- if (nlflag == 2 && nexttoken_ends_list())
+ if (nlflag == 2 && peektoken())
return NULL;
n1 = NULL;
for (;;) {
@@ -10576,15 +10576,8 @@ list(int nlflag)
tokpushback = 1;
}
checkkwd = CHKNL | CHKKWD | CHKALIAS;
- if (nexttoken_ends_list()) {
- /* Testcase: "<<EOF; then <W".
- * It used to segfault w/o this check:
- */
- if (heredoclist) {
- raise_error_unexpected_syntax(-1);
- }
+ if (peektoken())
return n1;
- }
break;
case TEOF:
if (heredoclist)
@@ -11962,7 +11955,7 @@ readtoken(void)
}
static char
-nexttoken_ends_list(void)
+peektoken(void)
{
int t;