AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-10803 Fix race in LocaleUtility::getAvailableLocaleNames().

Browse Source 
X-SVN-Rev: 35651
This commit is contained in:
Andy Heninger 2014-04-24 18:48:06 +00:00
parent 0a9c28990a
commit 4e5886643f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
icu4c/source/common/locutil.cpp
View File

@ -240,10 +240,18 @@ LocaleUtility::getAvailableLocaleNames(const UnicodeString& bundleID)
delete htp;
return NULL;
}
// See ticket #10803
umtx_lock(NULL);
cache->put(bundleID, (void*)htp, status);
umtx_unlock(NULL);
Hashtable *t = static_cast<Hashtable *>(cache->get(bundleID));
if (t != NULL) {
// Another thread raced through this code, creating the cache entry first.
// Discard ours and return theirs.
umtx_unlock(NULL);
delete htp;
htp = t;
} else {
cache->put(bundleID, (void*)htp, status);
umtx_unlock(NULL);
}
}
}
return htp;