From: Robert Figueiredo <robfig@gmail.com>
Date: Tue, 12 Mar 2013 21:35:14 +0000 (-0700)
Subject: html/template: Ensure release of namespace mutex in Template.Execute()
X-Git-Tag: go1.1rc2~543
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e1a5aa8105bba0be8d1fd064824983c3c685d953;p=gostls13.git

html/template: Ensure release of namespace mutex in Template.Execute()

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/6727046
---

diff --git a/src/pkg/html/template/template.go b/src/pkg/html/template/template.go
index 768cee7d5f..e183898d50 100644
--- a/src/pkg/html/template/template.go
+++ b/src/pkg/html/template/template.go
@@ -45,18 +45,24 @@ func (t *Template) Templates() []*Template {
 	return m
 }
 
-// Execute applies a parsed template to the specified data object,
-// writing the output to wr.
-func (t *Template) Execute(wr io.Writer, data interface{}) (err error) {
+// escape escapes all associated templates.
+func (t *Template) escape() error {
 	t.nameSpace.mu.Lock()
+	defer t.nameSpace.mu.Unlock()
 	if !t.escaped {
-		if err = escapeTemplates(t, t.Name()); err != nil {
-			t.escaped = true
+		if err := escapeTemplates(t, t.Name()); err != nil {
+			return err
 		}
+		t.escaped = true
 	}
-	t.nameSpace.mu.Unlock()
-	if err != nil {
-		return
+	return nil
+}
+
+// Execute applies a parsed template to the specified data object,
+// writing the output to wr.
+func (t *Template) Execute(wr io.Writer, data interface{}) error {
+	if err := t.escape(); err != nil {
+		return err
 	}
 	return t.text.Execute(wr, data)
 }