mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-16 20:53:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

tpl: Fix race condition in text template baseof

Browse Source 
Copy most of the htmltemplate cloning to the textemplate implementation
in the same function.
This commit is contained in:
Cameron Moore
2021-01-16 23:05:58 -06:00
committed by Bjørn Erik Pedersen
parent e19a046c4b
commit 241b7483ea
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tpl/tplimpl/template.go
View File

@@ -598,10 +598,16 @@ func (t *templateHandler) applyBaseTemplate(overlay, base templateInfo) (tpl.Tem
} }
} }
templ, err = templ.Parse(overlay.template) templ, err = texttemplate.Must(templ.Clone()).Parse(overlay.template)
if err != nil { if err != nil {
return nil, overlay.errWithFileContext("parse failed", err) return nil, overlay.errWithFileContext("parse failed", err)
} }
// The extra lookup is a workaround, see
// * https://github.com/golang/go/issues/16101
// * https://github.com/gohugoio/hugo/issues/2549
// templ = templ.Lookup(templ.Name())
return templ, nil return templ, nil
} }