qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 02:14:46 -07:00
Code Releases Activity

text/template: pipelined arg was not typechecked

Browse Source 
Without this fix, an erroneous template causes a panic; should be caught safely.
The bug did not affect correct templates.

Fixes #3267.

R=golang-dev, dsymonds, rsc
CC=golang-dev
https://golang.org/cl/5900065
This commit is contained in:
Rob Pike 2012-04-03 11:44:52 +10:00
parent d3c92b7c90
commit 065db4ea99
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pkg/text/template/exec.go
View File

@ -491,7 +491,11 @@ func (s *state) evalCall(dot, fun reflect.Value, name string, args []parse.Node,
} }
// Add final value if necessary. // Add final value if necessary.
if final.IsValid() { if final.IsValid() {
argv[i] = final t := typ.In(typ.NumIn() - 1)
if typ.IsVariadic() {
t = t.Elem()
}
argv[i] = s.validateType(final, t)
} }
result := fun.Call(argv) result := fun.Call(argv)
// If we have an error that is not nil, stop execution and return that error to the caller. // If we have an error that is not nil, stop execution and return that error to the caller.
@ -507,6 +511,7 @@ func (s *state) validateType(value reflect.Value, typ reflect.Type) reflect.Valu
switch typ.Kind() { switch typ.Kind() {
case reflect.Interface, reflect.Ptr, reflect.Chan, reflect.Map, reflect.Slice, reflect.Func: case reflect.Interface, reflect.Ptr, reflect.Chan, reflect.Map, reflect.Slice, reflect.Func:
// An untyped nil interface{}. Accept as a proper nil value. // An untyped nil interface{}. Accept as a proper nil value.
// TODO: Can we delete the other types in this list? Should we?
value = reflect.Zero(typ) value = reflect.Zero(typ)
default: default:
s.errorf("invalid value; expected %s", typ) s.errorf("invalid value; expected %s", typ)

8
src/pkg/text/template/exec_test.go
View File

@ -470,6 +470,9 @@ var execTests = []execTest{
{"bug7a", "{{3 2}}", "", tVal, false}, {"bug7a", "{{3 2}}", "", tVal, false},
{"bug7b", "{{$x := 1}}{{$x 2}}", "", tVal, false}, {"bug7b", "{{$x := 1}}{{$x 2}}", "", tVal, false},
{"bug7c", "{{$x := 1}}{{3 | $x}}", "", tVal, false}, {"bug7c", "{{$x := 1}}{{3 | $x}}", "", tVal, false},
// Pipelined arg was not being type-checked.
{"bug8a", "{{3|oneArg}}", "", tVal, false},
{"bug8b", "{{4|dddArg 3}}", "", tVal, false},
} }
func zeroArgs() string { func zeroArgs() string {
@ -480,6 +483,10 @@ func oneArg(a string) string {
return "oneArg=" + a return "oneArg=" + a
} }
func dddArg(a int, b ...string) string {
return fmt.Sprintln(a, b)
}
// count returns a channel that will deliver n sequential 1-letter strings starting at "a" // count returns a channel that will deliver n sequential 1-letter strings starting at "a"
func count(n int) chan string { func count(n int) chan string {
if n == 0 { if n == 0 {
@ -504,6 +511,7 @@ func testExecute(execTests []execTest, template *Template, t *testing.T) {
b := new(bytes.Buffer) b := new(bytes.Buffer)
funcs := FuncMap{ funcs := FuncMap{
"count": count, "count": count,
"dddArg": dddArg,
"oneArg": oneArg, "oneArg": oneArg,
"typeOf": typeOf, "typeOf": typeOf,
"vfunc": vfunc, "vfunc": vfunc,