aboutsummaryrefslogtreecommitdiff
path: root/src/text/template/exec.go
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2022-10-31 15:58:06 -0700
committerGopher Robot <gobot@golang.org>2022-11-02 18:43:27 +0000
commitbe7068fb0804f661515c678bee9224b90b32869a (patch)
tree4fbfe9031091009a97bd41b8591f3a4e11ab83e9 /src/text/template/exec.go
parentc53390b078b4d3b18e3aca8970d4b31d4d82cce1 (diff)
downloadgo-be7068fb0804f661515c678bee9224b90b32869a.tar.xz
text/template: correct assignment, not declaration, in range
We were mishandling {{range $i = .}}, treating it as though it were {{range $i := .}}. That happened to work if $i were the most recently declared variable, but not otherwise. Fixes #56490 Change-Id: I222a009d671d86c06a980a54388e05f12101c00b Reviewed-on: https://go-review.googlesource.com/c/go/+/446795 Run-TryBot: Ian Lance Taylor <iant@google.com> Reviewed-by: Ian Lance Taylor <iant@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Rob Pike <r@golang.org> Run-TryBot: Ian Lance Taylor <iant@golang.org> Reviewed-by: Bryan Mills <bcmills@google.com> Auto-Submit: Ian Lance Taylor <iant@google.com>
Diffstat (limited to 'src/text/template/exec.go')
-rw-r--r--src/text/template/exec.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/text/template/exec.go b/src/text/template/exec.go
index 66cb535c47..fb60c17931 100644
--- a/src/text/template/exec.go
+++ b/src/text/template/exec.go
@@ -363,11 +363,19 @@ func (s *state) walkRange(dot reflect.Value, r *parse.RangeNode) {
oneIteration := func(index, elem reflect.Value) {
// Set top var (lexically the second if there are two) to the element.
if len(r.Pipe.Decl) > 0 {
- s.setTopVar(1, elem)
+ if r.Pipe.IsAssign {
+ s.setVar(r.Pipe.Decl[0].Ident[0], elem)
+ } else {
+ s.setTopVar(1, elem)
+ }
}
// Set next var (lexically the first if there are two) to the index.
if len(r.Pipe.Decl) > 1 {
- s.setTopVar(2, index)
+ if r.Pipe.IsAssign {
+ s.setVar(r.Pipe.Decl[1].Ident[0], index)
+ } else {
+ s.setTopVar(2, index)
+ }
}
defer s.pop(mark)
defer func() {