mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-05-01 08:00:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix crash for closing shortcode with no .Inner set

Browse source 
Fixes #6857
Closes #7330
This commit is contained in:
Bjørn Erik Pedersen 2020-06-14 18:16:45 +02:00
parent 145b3fcce3
commit d6ed17c60f
2 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
hugolib/shortcode.go
View file

@ -496,19 +496,26 @@ Loop:
case currItem.IsRightShortcodeDelim():
// we trust the template on this:
// if there's no inner, we're done
if !sc.isInline && !sc.info.ParseInfo().IsInner {
return sc, nil
if !sc.isInline {
if sc.info == nil {
// This should not happen.
return sc, fail(errors.New("BUG: template info not set"), currItem)
}
if !sc.info.ParseInfo().IsInner {
return sc, nil
}
}
case currItem.IsShortcodeClose():
next := pt.Peek()
if !sc.isInline && !sc.info.ParseInfo().IsInner {
if next.IsError() {
// return that error, more specific
continue
if !sc.isInline {
if sc.info == nil || !sc.info.ParseInfo().IsInner {
if next.IsError() {
// return that error, more specific
continue
}
return sc, fail(_errors.Errorf("shortcode %q has no .Inner, yet a closing tag was provided", next.Val), next)
}
return sc, fail(_errors.Errorf("shortcode %q has no .Inner, yet a closing tag was provided", next.Val), next)
}
if next.IsRightShortcodeDelim() {
// self-closing