diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-05-03 16:32:52 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-05-04 00:03:39 +0000 |
| commit | 496d7c691481966fd6ea806205aa025698a172af (patch) | |
| tree | fff6874472a75414215501f76584e955c9e1df52 /src/html | |
| parent | 731a015ab8c8f44c7196123fd65b184a63d6835a (diff) | |
| download | go-496d7c691481966fd6ea806205aa025698a172af.tar.gz go-496d7c691481966fd6ea806205aa025698a172af.zip | |
text/template: add lock for Template.tmpl to fix data race
This adds a new lock protecting "tmpl".
This is a copy of https://golang.org/cl/257817 by Andreas Fleig,
updated for current tip, and updated to start running the
html/template TestEscapeRace test.
Thanks to @bep for providing the test case.
Fixes #39807
Change-Id: Ic8874484290283a49116812eeaffb8608346dc70
Reviewed-on: https://go-review.googlesource.com/c/go/+/316669
Trust: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Diffstat (limited to 'src/html')
| -rw-r--r-- | src/html/template/exec_test.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/html/template/exec_test.go b/src/html/template/exec_test.go index 7d1bef1782..888587335d 100644 --- a/src/html/template/exec_test.go +++ b/src/html/template/exec_test.go @@ -1720,8 +1720,6 @@ var v = "v"; ` func TestEscapeRace(t *testing.T) { - t.Skip("this test currently fails with -race; see issue #39807") - tmpl := New("") _, err := tmpl.New("templ.html").Parse(raceText) if err != nil { |