aboutsummaryrefslogtreecommitdiff
path: root/src/text/template/exec.go
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2015-05-13 12:59:33 -0700
committerRob Pike <r@golang.org>2015-05-14 17:47:06 +0000
commit92bdbb8a3c8a5a6535d1eb3b2021824662ccaf33 (patch)
tree84a24b858225f1626344911fbf3ec71c01f3d6e6 /src/text/template/exec.go
parentecfe42cab0c22da35aed6752cafaf0d3c7bb44d4 (diff)
downloadgo-92bdbb8a3c8a5a6535d1eb3b2021824662ccaf33.tar.xz
text/template: need to validate type when an argument is a function call
Missed a case; just need to call validateType. Fixes #10800. Change-Id: I81997ca7a9feb1be31c8b47e631b32712d7ffb86 Reviewed-on: https://go-review.googlesource.com/10031 Reviewed-by: Andrew Gerrand <adg@golang.org>
Diffstat (limited to 'src/text/template/exec.go')
-rw-r--r--src/text/template/exec.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/text/template/exec.go b/src/text/template/exec.go
index e6e1287993..ebafb4b5dc 100644
--- a/src/text/template/exec.go
+++ b/src/text/template/exec.go
@@ -660,7 +660,7 @@ func (s *state) evalArg(dot reflect.Value, typ reflect.Type, n parse.Node) refle
case *parse.PipeNode:
return s.validateType(s.evalPipeline(dot, arg), typ)
case *parse.IdentifierNode:
- return s.evalFunction(dot, arg, arg, nil, zero)
+ return s.validateType(s.evalFunction(dot, arg, arg, nil, zero), typ)
case *parse.ChainNode:
return s.validateType(s.evalChainNode(dot, arg, nil, zero), typ)
}