From c33a8528f864b71f046e0325121a809580d85531 Mon Sep 17 00:00:00 2001 From: bep Date: Fri, 20 Feb 2015 17:41:37 +0100 Subject: [PATCH] Avoid race condition in isInnerShortcode As reported by Go's race detector. See #917 --- hugolib/shortcode.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go index 0bdfcd5a5..41560c0f4 100644 --- a/hugolib/shortcode.go +++ b/hugolib/shortcode.go @@ -160,11 +160,10 @@ func isInnerShortcode(t *template.Template) bool { return m } - match, _ := regexp.MatchString("{{.*?\\.Inner.*?}}", t.Tree.Root.String()) - isInnerShortcodeCache.Lock() + defer isInnerShortcodeCache.Unlock() + match, _ := regexp.MatchString("{{.*?\\.Inner.*?}}", t.Tree.Root.String()) isInnerShortcodeCache.m[t.Name()] = match - isInnerShortcodeCache.Unlock() return match }