tpl: Fix deadlock in cached partials

Cached partials that contained cached partials would create a deadlock.

Fixes #2935

diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go
index 6c8a9957ee422ff5cdcc5149292c55247ba075fc..8f653808b52bde82f0b4788be69bb23ca4260e0b 100644 (file)
--- a/tpl/template_funcs.go
+++ b/tpl/template_funcs.go
@@ -1541,7 +1541,10 @@ func (tf *templateFuncster) Get(key, name string, context interface{}) (p templa
 
        tf.cachedPartials.Lock()
        if p, ok = tf.cachedPartials.p[key]; !ok {
+               tf.cachedPartials.Unlock()
                p = tf.t.partial(name, context)
+
+               tf.cachedPartials.Lock()
                tf.cachedPartials.p[key] = p
        }
        tf.cachedPartials.Unlock()