Skip to content

CFTimeZone: lock the timezone-cache lookup (data race) #64

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
DTW-Thalion wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −10
Open

CFTimeZone: lock the timezone-cache lookup (data race) #64

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
15 changes: 5 additions & 10 deletions Source/CFTimeZone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,13 @@ CFTimeZoneCreate (CFAllocatorRef alloc, CFStringRef name, CFDataRef data)
struct __CFTimeZone *new;
CFTimeZoneRef old;

GSMutexLock(&_kCFTimeZoneCacheLock);
if (_kCFTimeZoneCache == NULL)
{
GSMutexLock(&_kCFTimeZoneCacheLock);
/* Double check the cache is still NULL. */
if (_kCFTimeZoneCache == NULL)
_kCFTimeZoneCache = CFDictionaryCreateMutable (
kCFAllocatorSystemDefault, 0,
&kCFCopyStringDictionaryKeyCallBacks, NULL);
GSMutexUnlock(&_kCFTimeZoneCacheLock);
}
/* Verify we haven't created a timezone with this name already. */
_kCFTimeZoneCache = CFDictionaryCreateMutable (
kCFAllocatorSystemDefault, 0,
&kCFCopyStringDictionaryKeyCallBacks, NULL);
old = (CFTimeZoneRef)CFDictionaryGetValue (_kCFTimeZoneCache, name);
GSMutexUnlock(&_kCFTimeZoneCacheLock);
if (old != NULL)
return CFRetain (old);

Expand Down