Skip to content

Commit

Permalink
Fix cases.Title crash for concurrency (#23885)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
wxiaoguang authored Apr 3, 2023
1 parent cb6ed84 commit 5fc9929
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions modules/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,19 +186,16 @@ func ToUpperASCII(s string) string {
return string(b)
}

var (
titleCaser = cases.Title(language.English)
titleCaserNoLower = cases.Title(language.English, cases.NoLower)
)

// ToTitleCase returns s with all english words capitalized
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 {
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) {
Expand Down

0 comments on commit 5fc9929

Please sign in to comment.