From 30bdb172b2e870a585e7c8aa40a615f5124ac041 Mon Sep 17 00:00:00 2001
From: alexej-v <a1exej-v@yandex.ru>
Date: Thu, 26 Jul 2018 11:05:00 +0300
Subject: [PATCH] Fix lexer.errInvalidToken panic

---
 jlexer/lexer.go      | 13 +++++++++----
 jlexer/lexer_test.go | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/jlexer/lexer.go b/jlexer/lexer.go
index 90525e6..24cec21 100644
--- a/jlexer/lexer.go
+++ b/jlexer/lexer.go
@@ -240,7 +240,7 @@ func (r *Lexer) fetchNumber() {
 
 // findStringLen tries to scan into the string literal for ending quote char to determine required size.
 // The size will be exact if no escapes are present and may be inexact if there are escaped chars.
-func findStringLen(data []byte) (hasEscapes bool, length int) {
+func findStringLen(data []byte) (isValid, hasEscapes bool, length int) {
 	delta := 0
 
 	for i := 0; i < len(data); i++ {
@@ -252,11 +252,11 @@ func findStringLen(data []byte) (hasEscapes bool, length int) {
 				delta++
 			}
 		case '"':
-			return (delta > 0), (i - delta)
+			return true, (delta > 0), (i - delta)
 		}
 	}
 
-	return false, len(data)
+	return false, false, len(data)
 }
 
 // getu4 decodes \uXXXX from the beginning of s, returning the hex value,
@@ -342,7 +342,12 @@ func (r *Lexer) fetchString() {
 	r.pos++
 	data := r.Data[r.pos:]
 
-	hasEscapes, length := findStringLen(data)
+	isValid, hasEscapes, length := findStringLen(data)
+	if !isValid {
+		r.pos += length
+		r.errParse("missing trailing string literal")
+		return
+	}
 	if !hasEscapes {
 		r.token.byteValue = data[:length]
 		r.pos += length + 1
diff --git a/jlexer/lexer_test.go b/jlexer/lexer_test.go
index 529a270..2a655dd 100644
--- a/jlexer/lexer_test.go
+++ b/jlexer/lexer_test.go
@@ -312,3 +312,22 @@ func TestJsonNumber(t *testing.T) {
 		}
 	}
 }
+
+func TestFetchStringUnterminatedString(t *testing.T) {
+	for _, test := range []struct {
+		data []byte
+	}{
+		{data: []byte(`"sting without trailing literal`)},
+		{data: []byte(`"\"`)},
+		{data: []byte{'"'}},
+	} {
+		l := Lexer{Data: test.data}
+		l.fetchString()
+		if l.pos > len(l.Data) {
+			t.Errorf("pos should not be greater than length of Data")
+		}
+		if l.Error() == nil {
+			t.Errorf("fetchString() should add parsing error")
+		}
+	}
+}