From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sat, 8 Jul 2017 08:56:56 +0000 (+0200)
Subject: parser: Fix issue with escaped JSON front matter
X-Git-Tag: v0.25.1~6
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=84db6c74a;p=brevno-suite%2Fhugo

parser: Fix issue with escaped JSON front matter

Fixes #3682
---

diff --git a/parser/page.go b/parser/page.go
index 9d633e29..f17ba176 100644
--- a/parser/page.go
+++ b/parser/page.go
@@ -300,12 +300,12 @@ func determineDelims(firstLine []byte) (left, right []byte) {
 // function.
 func extractFrontMatterDelims(r *bufio.Reader, left, right []byte) (fm []byte, err error) {
 	var (
-		c         byte
-		buf       bytes.Buffer
-		level     int
-		sameDelim = bytes.Equal(left, right)
-		inQuote   bool
-		escaped   bool
+		c           byte
+		buf         bytes.Buffer
+		level       int
+		sameDelim   = bytes.Equal(left, right)
+		inQuote     bool
+		escapeState int
 	)
 	// Frontmatter must start with a delimiter. To check it first,
 	// pre-reads beginning delimiter length - 1 bytes from Reader
@@ -334,12 +334,12 @@ func extractFrontMatterDelims(r *bufio.Reader, left, right []byte) (fm []byte, e
 
 		switch c {
 		case '"':
-			if !escaped {
+			if escapeState != 1 {
 				inQuote = !inQuote
 			}
-			escaped = false
+			escapeState = 0
 		case '\\':
-			escaped = true
+			escapeState++
 		case left[len(left)-1]:
 			if sameDelim { // YAML, TOML case
 				if bytes.HasSuffix(buf.Bytes(), left) && (buf.Len() == len(left) || buf.Bytes()[buf.Len()-len(left)-1] == '\n') {
diff --git a/parser/parse_frontmatter_test.go b/parser/parse_frontmatter_test.go
index e2722f78..b7764ca2 100644
--- a/parser/parse_frontmatter_test.go
+++ b/parser/parse_frontmatter_test.go
@@ -304,6 +304,7 @@ func TestExtractFrontMatterDelim(t *testing.T) {
 		{`{ "title": "\"{", "other": "\"{}" }`, `{ "title": "\"{", "other": "\"{}" }`, noErrExpected},
 		{`{ "title": "\"Foo\"" }`, `{ "title": "\"Foo\"" }`, noErrExpected},
 		{`{ "title": "\"Foo\"\"" }`, `{ "title": "\"Foo\"\"" }`, noErrExpected},
+		{`{ "url": "http:\/\/example.com\/play\/url?id=1" }`, `{ "url": "http:\/\/example.com\/play\/url?id=1" }`, noErrExpected},
 	}
 
 	for i, test := range tests {