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

template: fix error checking on execute without parse

Browse Source 
Fixed error checking in exec.go to give a sensible error message when
execution is attempted before a successful parse (rather than an
outright panic).

R=r
CC=golang-dev
https://golang.org/cl/5306065
This commit is contained in:
Scott Lawrence 2011-10-31 16:07:17 -07:00 committed by Rob Pike
parent 92926f5472
commit cae23f036a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pkg/exp/template/html/escape_test.go
View File

@ -1549,8 +1549,8 @@ func TestEnsurePipelineContains(t *testing.T) {
} }
} }
func expectExecuteFailure(t *testing.T, b *bytes.Buffer) { func expectExecuteFailure(t *testing.T, b *bytes.Buffer, err os.Error) {
if x := recover(); x != nil { if err != nil {
if b.Len() != 0 { if b.Len() != 0 {
t.Errorf("output on buffer: %q", b.String()) t.Errorf("output on buffer: %q", b.String())
} }
@ -1563,8 +1563,8 @@ func TestEscapeErrorsNotIgnorable(t *testing.T) {
var b bytes.Buffer var b bytes.Buffer
tmpl := template.Must(template.New("dangerous").Parse("<a")) tmpl := template.Must(template.New("dangerous").Parse("<a"))
Escape(tmpl) Escape(tmpl)
defer expectExecuteFailure(t, &b) err := tmpl.Execute(&b, nil)
tmpl.Execute(&b, nil) expectExecuteFailure(t, &b, err)
} }
func TestEscapeSetErrorsNotIgnorable(t *testing.T) { func TestEscapeSetErrorsNotIgnorable(t *testing.T) {
@ -1574,8 +1574,8 @@ func TestEscapeSetErrorsNotIgnorable(t *testing.T) {
} }
EscapeSet(s, "t") EscapeSet(s, "t")
var b bytes.Buffer var b bytes.Buffer
defer expectExecuteFailure(t, &b) err = s.Execute(&b, "t", nil)
s.Execute(&b, "t", nil) expectExecuteFailure(t, &b, err)
} }
func TestRedundantFuncs(t *testing.T) { func TestRedundantFuncs(t *testing.T) {

2
src/pkg/template/exec.go
View File

@ -97,7 +97,7 @@ func (t *Template) Execute(wr io.Writer, data interface{}) (err os.Error) {
line: 1, line: 1,
vars: []variable{{"$", value}}, vars: []variable{{"$", value}},
} }
if t.Root == nil { if t.Tree == nil || t.Root == nil {
state.errorf("must be parsed before execution") state.errorf("must be parsed before execution")
} }
state.walk(value, t.Root) state.walk(value, t.Root)