mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-19 21:21:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid panic in shortcode param handling

Browse Source 
Fixes #1337
This commit is contained in:
Bjørn Erik Pedersen
2015-08-07 20:08:23 +02:00
parent 35bb72c83e
commit 0f1fb8c7d8
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
hugolib/shortcode.go
View File

@@ -271,6 +271,8 @@ func extractAndRenderShortcodes(stringToParse string, p *Page, t tpl.Template) (
}
var shortCodeIllegalState = errors.New("Illegal shortcode state")
// pageTokens state:
// - before: positioned just before the shortcode start
// - after: shortcode(s) consumed (plural when they are nested)
@@ -353,8 +355,12 @@ Loop:
params[currItem.val] = pt.next().val
sc.params = params
} else {
params := sc.params.(map[string]string)
params[currItem.val] = pt.next().val
if params, ok := sc.params.(map[string]string); ok {
params[currItem.val] = pt.next().val
} else {
return sc, shortCodeIllegalState
}
}
} else {
// positional params
@@ -363,9 +369,13 @@ Loop:
params = append(params, currItem.val)
sc.params = params
} else {
params := sc.params.([]string)
params = append(params, currItem.val)
sc.params = params
if params, ok := sc.params.([]string); ok {
params = append(params, currItem.val)
sc.params = params
} else {
return sc, shortCodeIllegalState
}
}
}