shithub: hugo

Info  •  Files  •  Log  •  Branches

parser: Final (!) fix for issue with escaped JSON front matter

Fixes #3682

--- a/parser/page.go

+++ b/parser/page.go

@@ -337,7 +337,6 @@

 			if escapeState != 1 {

 				inQuote = !inQuote

 			}

-			escapeState = 0

 		case '\\':

 			escapeState++

 		case left[len(left)-1]:

@@ -401,6 +400,10 @@

 			}

 			return buf.Bytes(), nil

+		}

+

+		if c != '\\' {

+			escapeState = 0

 		}

 	}

--- a/parser/parse_frontmatter_test.go

+++ b/parser/parse_frontmatter_test.go

@@ -305,6 +305,8 @@

 		{`{ "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 {