syntax: fix another lexer error crash

We had a couple of these "if err != nil { tok = EOF }", but we were missing a third one in this last case. Found via fuzzing.
mvdan · Jan 25, 2018 · 73411ab · 73411ab
1 parent 7f13687
commit 73411ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/syntax/lexer.go b/syntax/lexer.go
@@ -159,6 +159,9 @@ func (p *Parser) nextKeepSpaces() {
 			p.advanceLitOther(r)
 		}
 	}
+	if p.err != nil && p.tok != _EOF {
+		p.tok = _EOF
+	}
 }
 
 func (p *Parser) next() {

diff --git a/syntax/parser_test.go b/syntax/parser_test.go
@@ -437,6 +437,10 @@ var shellTests = []errorCase{
 		in:     "${a#\x80",
 		common: `1:5: invalid UTF-8 encoding`,
 	},
+	{
+		in:     "${a-'\x80",
+		common: `1:6: invalid UTF-8 encoding`,
+	},
 	{
 		in:     "echo $((a |\x80",
 		common: `1:12: invalid UTF-8 encoding`,