From 8444a545e3d38c2e470df5035ef4b5a9365aaefc Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 5 Oct 2021 11:41:40 -0700 Subject: text/template: only unwrap final and/or value In the last CL I missed the fact that except for the final value the code already unwraps the argument. For #31103 Change-Id: Ic9099aeb50c6b3322fc14a90ac8026c1d8cb1698 Reviewed-on: https://go-review.googlesource.com/c/go/+/354091 Trust: Ian Lance Taylor Run-TryBot: Ian Lance Taylor Reviewed-by: Bryan C. Mills --- src/text/template/exec.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/text/template/exec.go') diff --git a/src/text/template/exec.go b/src/text/template/exec.go index 9a4c9e29dd..9ae6fdc3cc 100644 --- a/src/text/template/exec.go +++ b/src/text/template/exec.go @@ -728,13 +728,21 @@ func (s *state) evalCall(dot, fun reflect.Value, isBuiltin bool, node parse.Node for _, arg := range args { v = s.evalArg(dot, argType, arg).Interface().(reflect.Value) if truth(v) == (name == "or") { - return unwrap(v) + // This value was already unwrapped + // by the .Interface().(reflect.Value). + return v } } if final != missingVal { - v = s.validateType(final, argType) + // The last argument to and/or is coming from + // the pipeline. We didn't short circuit on an earlier + // argument, so we are going to return this one. + // We don't have to evaluate final, but we do + // have to check its type. Then, since we are + // going to return it, we have to unwrap it. + v = unwrap(s.validateType(final, argType)) } - return unwrap(v) + return v } // Build the arg list. -- cgit v1.3-5-g9baa