Merge pull request #125 from z7zmey/issue-98

[#98] fix panic when heredoc is not closed
z7zmey · Feb 13, 2021 · c3287f4 · c3287f4
2 parents 15e7237 + e1686cb
commit c3287f4
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/internal/scanner/lexer.go b/internal/scanner/lexer.go
@@ -140,6 +140,10 @@ func (lex *Lexer) isHeredocEndSince73(p int) bool {
 		return false
 	}
 
+	if p == len(lex.data) {
+		return false
+	}
+
 	for lex.data[p] == ' ' || lex.data[p] == '\t' {
 		p++
 	}

diff --git a/internal/scanner/scanner_test.go b/internal/scanner/scanner_test.go
@@ -1091,6 +1091,34 @@ CAT;`
 	assert.DeepEqual(t, expected, actual)
 }
 
+func TestHereDocUnclosed(t *testing.T) {
+	src := "<?<<<'S'\n"
+
+	expected := []string{
+		token.T_START_HEREDOC.String(),
+	}
+
+	config := cfg.Config{
+		Version: &version.Version{
+			Major: 7,
+			Minor: 4,
+		},
+	}
+	lexer := NewLexer([]byte(src), config)
+	actual := []string{}
+
+	for {
+		tkn := lexer.Lex()
+		if tkn.ID == 0 {
+			break
+		}
+
+		actual = append(actual, tkn.ID.String())
+	}
+
+	assert.DeepEqual(t, expected, actual)
+}
+
 func TestInlineHtmlNopTokens(t *testing.T) {
 	src := `<?php
 		$a; ?> test <?php