From 7f82b41a24af0fd04d28fbfebf9254766a3c6e6f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sat, 8 Jul 2017 18:43:36 +0200 Subject: [PATCH] parser: Final (!) fix for issue with escaped JSON front matter Fixes #3682 --- parser/page.go | 5 ++++- parser/parse_frontmatter_test.go | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/parser/page.go b/parser/page.go index f17ba176..1537915f 100644 --- a/parser/page.go +++ b/parser/page.go @@ -337,7 +337,6 @@ func extractFrontMatterDelims(r *bufio.Reader, left, right []byte) (fm []byte, e if escapeState != 1 { inQuote = !inQuote } - escapeState = 0 case '\\': escapeState++ case left[len(left)-1]: @@ -403,6 +402,10 @@ func extractFrontMatterDelims(r *bufio.Reader, left, right []byte) (fm []byte, e return buf.Bytes(), nil } + if c != '\\' { + escapeState = 0 + } + } } diff --git a/parser/parse_frontmatter_test.go b/parser/parse_frontmatter_test.go index b7764ca2..14e69abf 100644 --- a/parser/parse_frontmatter_test.go +++ b/parser/parse_frontmatter_test.go @@ -305,6 +305,8 @@ func TestExtractFrontMatterDelim(t *testing.T) { {`{ "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}, + {`{ "test": "\"New\r\nString\"" }`, `{ "test": "\"New\r\nString\"" }`, noErrExpected}, + {`{ "test": "RTS\/RPG" }`, `{ "test": "RTS\/RPG" }`, noErrExpected}, } for i, test := range tests { -- 2.30.2