diff options
| author | Brian Foley | 2016-10-15 14:45:40 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2016-10-24 02:09:56 +0200 |
| commit | 61d5997b586a28f79d54b28ce6963b643dff6e9e (patch) | |
| tree | 161fb8911ed9a5bda79d1a1f8ac34534aae40564 | |
| parent | 1336052a490ffe7a3790ee3c1366756ca8a7f5ca (diff) | |
| download | busybox-61d5997b586a28f79d54b28ce6963b643dff6e9e.zip busybox-61d5997b586a28f79d54b28ce6963b643dff6e9e.tar.gz | |
awk: fix segfault on for loop syntax error
Parsing "for()" segfaults as awk fails to find loop iteration expressions.
Signed-off-by: Brian Foley <bpfoley@google.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | editors/awk.c | 2 | ||||
| -rwxr-xr-x | testsuite/awk.tests | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/editors/awk.c b/editors/awk.c index d0269b9..685e8be 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -1514,7 +1514,7 @@ static void chain_group(void) next_token(TC_SEQSTART); n2 = parse_expr(TC_SEMICOL | TC_SEQTERM); if (t_tclass & TC_SEQTERM) { /* for-in */ - if ((n2->info & OPCLSMASK) != OC_IN) + if (!n2 || (n2->info & OPCLSMASK) != OC_IN) syntax_error(EMSG_UNEXP_TOKEN); n = chain_node(OC_WALKINIT | VV); n->l.n = n2->l.n; diff --git a/testsuite/awk.tests b/testsuite/awk.tests index adab4ae..82937bc 100755 --- a/testsuite/awk.tests +++ b/testsuite/awk.tests @@ -316,6 +316,9 @@ testing "awk continue" \ "" \ 'BEGIN { if (1) continue; else a = 1 }' +testing "awk handles invalid for loop" \ + "awk '{ for() }' 2>&1" "awk: cmd. line:1: Unexpected token\n" "" "" + # testing "description" "command" "result" "infile" "stdin" exit $FAILCOUNT |