shithub: hugo

Info  •  Files  •  Log  •  Branches

Avoid race condition in isInnerShortcode

As reported by Go's race detector.

See #917

--- a/hugolib/shortcode.go

+++ b/hugolib/shortcode.go

@@ -160,11 +160,10 @@

 		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

 }