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

Fix recently introduced new data race in the shortcode handling

Browse source 
Fixes #1599
This commit is contained in:
Bjørn Erik Pedersen 2015-11-21 20:03:18 +01:00
parent 5c7234015d
commit 58c446f562
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hugolib/shortcode.go
View file

@ -343,9 +343,14 @@ Loop:
if tmpl == nil { if tmpl == nil {
return sc, fmt.Errorf("Unable to locate template for shortcode '%s' in page %s", sc.name, p.BaseFileName()) return sc, fmt.Errorf("Unable to locate template for shortcode '%s' in page %s", sc.name, p.BaseFileName())
} }
// TODO(bep) Refactor/rename this lock strategy
isInnerShortcodeCache.Lock()
if tmpl.Tree == nil { if tmpl.Tree == nil {
isInnerShortcodeCache.Unlock()
return sc, fmt.Errorf("Template for shortcode '%s' failed to compile for page '%s'", sc.name, p.BaseFileName()) return sc, fmt.Errorf("Template for shortcode '%s' failed to compile for page '%s'", sc.name, p.BaseFileName())
} }
isInnerShortcodeCache.Unlock()
isInner = isInnerShortcode(tmpl) isInner = isInnerShortcode(tmpl)
case tScParam: case tScParam: