From be9df847723f414770d38c071eada0cbe646b4e3 Mon Sep 17 00:00:00 2001 From: bep Date: Thu, 30 Apr 2015 15:59:14 +0200 Subject: shortcodeparser: fix panic on slash following opening shortcode comment Fixes #1093 --- hugolib/shortcode.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'hugolib/shortcode.go') diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go index 722c86db0..2a973f99b 100644 --- a/hugolib/shortcode.go +++ b/hugolib/shortcode.go @@ -125,7 +125,11 @@ func (sc shortcode) String() string { // HandleShortcodes does all in one go: extract, render and replace // only used for testing func HandleShortcodes(stringToParse string, page *Page, t tpl.Template) (string, error) { - tmpContent, tmpShortcodes := extractAndRenderShortcodes(stringToParse, page, t) + tmpContent, tmpShortcodes, err := extractAndRenderShortcodes(stringToParse, page, t) + + if err != nil { + return "", err + } if len(tmpShortcodes) > 0 { tmpContentWithTokensReplaced, err := replaceShortcodeTokens([]byte(tmpContent), shortcodePlaceholderPrefix, true, tmpShortcodes) @@ -236,7 +240,7 @@ func renderShortcode(sc shortcode, p *Page, t tpl.Template) string { return renderShortcodeWithPage(tmpl, data) } -func extractAndRenderShortcodes(stringToParse string, p *Page, t tpl.Template) (string, map[string]string) { +func extractAndRenderShortcodes(stringToParse string, p *Page, t tpl.Template) (string, map[string]string, error) { content, shortcodes, err := extractShortcodes(stringToParse, p, t) renderedShortcodes := make(map[string]string) @@ -255,7 +259,7 @@ func extractAndRenderShortcodes(stringToParse string, p *Page, t tpl.Template) ( } } - return content, renderedShortcodes + return content, renderedShortcodes, err } -- cgit v1.2.3