Skip to content

ICU-23352 Fix race condition UAF in uprv_collation_root_cleanup #3921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hirorogo wants to merge 1 commit into
base: maint/maint-54
Choose a base branch
from
+4 −1
Open

ICU-23352 Fix race condition UAF in uprv_collation_root_cleanup #3921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion icu4c/source/i18n/collationroot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ static UInitOnce initOnce = U_INITONCE_INITIALIZER;
U_CDECL_BEGIN

static UBool U_CALLCONV uprv_collation_root_cleanup() {
SharedObject::clearPtr(rootSingleton);
// Reset initOnce first so that concurrent getRoot()/getRootCacheEntry()
// callers will block on re-initialization rather than dereferencing
// a rootSingleton that is being (or has been) cleared.
initOnce.reset();
SharedObject::clearPtr(rootSingleton);
return TRUE;
}

Expand Down