Permalink
Browse files

parser: Fix issue with escaped JSON front matter

Fixes #3682
  • Loading branch information...
bep committed Jul 8, 2017
1 parent e0cf2e0 commit 84db6c74a084d2b52117b999d4ec343cd3389a68
Showing with 10 additions and 9 deletions.
  1. +9 −9 parser/page.go
  2. +1 −0 parser/parse_frontmatter_test.go
View
@@ -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') {
@@ -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 {

0 comments on commit 84db6c7

Please sign in to comment.