qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 01:07:57 -07:00
Code Releases Activity

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

Browse Source 
R=golang-dev, r
CC=golang-dev
https://golang.org/cl/6727046
This commit is contained in:
Robert Figueiredo 2013-03-12 14:35:14 -07:00 committed by Rob Pike
parent f878b67b0f
commit e1a5aa8105
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pkg/html/template/template.go
View File

@ -45,18 +45,24 @@ func (t *Template) Templates() []*Template {
return m return m
} }
// 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 {
return err
}
t.escaped = true
}
return nil
}
// Execute applies a parsed template to the specified data object, // Execute applies a parsed template to the specified data object,
// writing the output to wr. // writing the output to wr.
func (t *Template) Execute(wr io.Writer, data interface{}) (err error) { func (t *Template) Execute(wr io.Writer, data interface{}) error {
t.nameSpace.mu.Lock() if err := t.escape(); err != nil {
if !t.escaped { return err
if err = escapeTemplates(t, t.Name()); err != nil {
t.escaped = true
}
}
t.nameSpace.mu.Unlock()
if err != nil {
return
} }
return t.text.Execute(wr, data) return t.text.Execute(wr, data)
} }