pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix cases.Title crash for concurrency (#23885)

Browse source 
Regression of #19676 and #21814

Fix #23872

`cases.Title` is not thread-safe, it has internal state, so it can't be
used as a global shared variable.
This commit is contained in:
wxiaoguang 2023-04-04 06:03:45 +08:00 committed by GitHub
parent cb6ed84c4b
commit 5fc9929da7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/util/util.go
View file

@ -186,19 +186,16 @@ func ToUpperASCII(s string) string {
return string(b) return string(b)
} }
var (
titleCaser = cases.Title(language.English)
titleCaserNoLower = cases.Title(language.English, cases.NoLower)
)
// ToTitleCase returns s with all english words capitalized // ToTitleCase returns s with all english words capitalized
func ToTitleCase(s string) string { func ToTitleCase(s string) string {
return titleCaser.String(s) // `cases.Title` is not thread-safe, do not use global shared variable for it
return cases.Title(language.English).String(s)
} }
// ToTitleCaseNoLower returns s with all english words capitalized without lowercasing // ToTitleCaseNoLower returns s with all english words capitalized without lower-casing
func ToTitleCaseNoLower(s string) string { func ToTitleCaseNoLower(s string) string {
return titleCaserNoLower.String(s) // `cases.Title` is not thread-safe, do not use global shared variable for it
return cases.Title(language.English, cases.NoLower).String(s)
} }
func logError(msg string, args ...any) { func logError(msg string, args ...any) {