github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix searching YAML/TOML delimiters in frontmatter

Browse source 
When a YAML/TOML's delimiter character sequence is included in a
frontmatter string, parser mistakes it as a delimiter. This fixes it by
checking a character right before the delimiter sequence is '\n' or it
is the beginning of the frontmatter.

Fix #1320
This commit is contained in:
Tatsushi Demachi 2015-08-03 23:32:51 +09:00 committed by Bjørn Erik Pedersen
parent 4bed69629e
commit 98659bf3b8
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
parser/page.go
View file

@ -207,7 +207,7 @@ func extractFrontMatterDelims(r *bufio.Reader, left, right []byte) (fm FrontMatt
switch c { switch c {
case left[len(left)-1]: case left[len(left)-1]:
if sameDelim { // YAML, TOML case if sameDelim { // YAML, TOML case
if bytes.HasSuffix(buf.Bytes(), left) { if bytes.HasSuffix(buf.Bytes(), left) && (buf.Len() == len(left) || buf.Bytes()[buf.Len()-len(left)-1] == '\n') {
nextByte: nextByte:
c, err = r.ReadByte() c, err = r.ReadByte()
if err != nil { if err != nil {

1
parser/parse_frontmatter_test.go
View file

@ -238,6 +238,7 @@ func TestExtractFrontMatter(t *testing.T) {
{"--- \nminc\n--- \ncontent", []byte("---\nminc\n---\n"), true}, {"--- \nminc\n--- \ncontent", []byte("---\nminc\n---\n"), true},
{"---\ncnim\n---\ncontent\n", []byte("---\ncnim\n---\n"), true}, {"---\ncnim\n---\ncontent\n", []byte("---\ncnim\n---\n"), true},
{"---\ntitle: slug doc 2\nslug: slug-doc-2\n---\ncontent\n", []byte("---\ntitle: slug doc 2\nslug: slug-doc-2\n---\n"), true}, {"---\ntitle: slug doc 2\nslug: slug-doc-2\n---\ncontent\n", []byte("---\ntitle: slug doc 2\nslug: slug-doc-2\n---\n"), true},
{"---\npermalink: '/blog/title---subtitle.html'\n---\ncontent\n", []byte("---\npermalink: '/blog/title---subtitle.html'\n---\n"), true},
} }
for _, test := range tests { for _, test := range tests {