Skip to content

Fix CFTimeZone crashes on Windows #5070

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

Merged
merged 2 commits into from
Aug 16, 2024
Merged

Fix CFTimeZone crashes on Windows #5070

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48e7023
Fix CFTimeZone crashes on Windows
jmschonfeld Aug 15, 2024
abcb1a0
Fix build failure
jmschonfeld Aug 15, 2024
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
135 changes: 12 additions & 123 deletions Sources/CoreFoundation/CFTimeZone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#if TARGET_OS_WIN32
#include <tchar.h>

#include "WindowsResources.h"
#include "CFTimeZone_WindowsMapping.h"
#define NOMINMAX
#define WIN32_LEAN_AND_MEAN
#include "Windows.h"
Expand Down Expand Up @@ -92,11 +92,6 @@ static CFArrayRef __CFKnownTimeZoneList = NULL;
static CFMutableDictionaryRef __CFTimeZoneCache = NULL;
static CFLock_t __CFTimeZoneGlobalLock = CFLockInit;

#if TARGET_OS_WIN32
static CFDictionaryRef __CFTimeZoneWinToOlsonDict = NULL;
static CFLock_t __CFTimeZoneWinToOlsonLock = CFLockInit;
#endif

CF_INLINE void __CFTimeZoneLockGlobal(void) {
__CFLock(&__CFTimeZoneGlobalLock);
}
Expand Down Expand Up @@ -672,110 +667,7 @@ CFTypeID CFTimeZoneGetTypeID(void) {
return _kCFRuntimeIDCFTimeZone;
}

#if TARGET_OS_WIN32
CF_INLINE void __CFTimeZoneLockWinToOlson(void) {
__CFLock(&__CFTimeZoneWinToOlsonLock);
}

CF_INLINE void __CFTimeZoneUnlockWinToOlson(void) {
__CFUnlock(&__CFTimeZoneWinToOlsonLock);
}

static Boolean CFTimeZoneLoadPlistResource(LPCSTR lpName, LPVOID *ppResource, LPDWORD pdwSize) {
HRSRC hResource;
HGLOBAL hMemory;
HMODULE hModule;

if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
(LPCWSTR)&CFTimeZoneLoadPlistResource, &hModule)) {
return FALSE;
}

hResource = FindResourceA(hModule, lpName, "PLIST");
if (hResource == NULL) {
return FALSE;
}

hMemory = LoadResource(hModule, hResource);
if (hMemory == NULL) {
return FALSE;
}

*pdwSize = SizeofResource(hModule, hResource);
*ppResource = LockResource(hMemory);

return *pdwSize && *ppResource;
}

CFDictionaryRef CFTimeZoneCopyWinToOlsonDictionary(void) {
CFDictionaryRef dict;

__CFTimeZoneLockWinToOlson();
if (NULL == __CFTimeZoneWinToOlsonDict) {
const uint8_t *plist;
DWORD dwSize;

if (CFTimeZoneLoadPlistResource(MAKEINTRESOURCEA(IDR_WINDOWS_OLSON_MAPPING), (LPVOID *)&plist, &dwSize)) {
CFDataRef data = CFDataCreate(kCFAllocatorSystemDefault, plist, dwSize);
__CFTimeZoneWinToOlsonDict = (CFDictionaryRef)CFPropertyListCreateFromXMLData(kCFAllocatorSystemDefault, data, kCFPropertyListImmutable, NULL);
CFRelease(data);
}
}
if (NULL == __CFTimeZoneWinToOlsonDict) {
__CFTimeZoneWinToOlsonDict = CFDictionaryCreate(kCFAllocatorSystemDefault, NULL, NULL, 0, NULL, NULL);
}
dict = __CFTimeZoneWinToOlsonDict ? (CFDictionaryRef)CFRetain(__CFTimeZoneWinToOlsonDict) : NULL;
__CFTimeZoneUnlockWinToOlson();

return dict;
}

static CFDictionaryRef CFTimeZoneCopyOlsonToWindowsDictionary(void) {
static CFDictionaryRef dict;
static CFLock_t lock;

__CFLock(&lock);
if (dict == NULL) {
const uint8_t *plist;
DWORD dwSize;

if (CFTimeZoneLoadPlistResource(MAKEINTRESOURCEA(IDR_OLSON_WINDOWS_MAPPING), (LPVOID *)&plist, &dwSize)) {
CFDataRef data = CFDataCreateWithBytesNoCopy(kCFAllocatorSystemDefault, plist, dwSize, kCFAllocatorNull);
dict = CFPropertyListCreateFromXMLData(kCFAllocatorSystemDefault, data, kCFPropertyListImmutable, NULL);
CFRelease(data);
}
}
__CFUnlock(&lock);

return dict ? CFRetain(dict) : NULL;
}

void CFTimeZoneSetWinToOlsonDictionary(CFDictionaryRef dict) {
__CFGenericValidateType(dict, CFDictionaryGetTypeID());
__CFTimeZoneLockWinToOlson();
if (dict != __CFTimeZoneWinToOlsonDict) {
CFDictionaryRef oldDict = __CFTimeZoneWinToOlsonDict;
__CFTimeZoneWinToOlsonDict = dict ? CFRetain(dict) : NULL;
CFRelease(oldDict);
}
__CFTimeZoneUnlockWinToOlson();
}

CFTimeZoneRef CFTimeZoneCreateWithWindowsName(CFAllocatorRef allocator, CFStringRef winName) {
if (!winName) return NULL;

CFDictionaryRef winToOlson = CFTimeZoneCopyWinToOlsonDictionary();
if (!winToOlson) return NULL;

CFStringRef olsonName = CFDictionaryGetValue(winToOlson, winName);
CFTimeZoneRef retval = NULL;
if (olsonName) {
retval = CFTimeZoneCreateWithName(allocator, olsonName, false);
}
CFRelease(winToOlson);
return retval;
}
#elif TARGET_OS_MAC
#if TARGET_OS_MAC
static void __InitTZStrings(void) {
static dispatch_once_t initOnce = 0;

Expand Down Expand Up @@ -810,7 +702,7 @@ static void __InitTZStrings(void) {
});
}

#elif TARGET_OS_ANDROID
#elif TARGET_OS_ANDROID || TARGET_OS_WINDOWS
// Nothing
#elif TARGET_OS_LINUX || TARGET_OS_BSD || TARGET_OS_WASI
static void __InitTZStrings(void) {
Expand All @@ -834,12 +726,7 @@ static CFTimeZoneRef __CFTimeZoneCreateSystem(void) {
LPWSTR standardName = (LPWSTR)&tzi.StandardName;
CFStringRef cfStandardName = CFStringCreateWithBytes(kCFAllocatorSystemDefault, (UInt8 *)standardName, wcslen(standardName)*sizeof(WCHAR), kCFStringEncodingUTF16LE, false);
if (cfStandardName) {
CFDictionaryRef winToOlson = CFTimeZoneCopyWinToOlsonDictionary();
if (winToOlson) {
name = CFDictionaryGetValue(winToOlson, cfStandardName);
if (name) CFRetain(name);
CFRelease(winToOlson);
}
name = _CFTimeZoneCopyOlsonNameForWindowsName(cfStandardName);
CFRelease(cfStandardName);
}
} else {
Expand Down Expand Up @@ -1326,16 +1213,17 @@ Boolean _CFTimeZoneInit(CFTimeZoneRef timeZone, CFStringRef name, CFDataRef data

tzName = CFDictionaryGetValue(abbrevs, name);
if (tzName == NULL) {
CFDictionaryRef olson = CFTimeZoneCopyOlsonToWindowsDictionary();
tzName = CFDictionaryGetValue(olson, name);
CFRelease(olson);
tzName = _CFTimeZoneCopyWindowsNameForOlsonName(name);
} else {
CFRetain(tzName);
}

CFRelease(abbrevs);

if (tzName) {
__CFTimeZoneGetOffset(tzName, &offset);
// TODO: handle DST
CFRelease(tzName);
return __CFTimeZoneInitFixed(timeZone, offset, name, 0);
}

Expand Down Expand Up @@ -1542,15 +1430,16 @@ CFTimeZoneRef CFTimeZoneCreateWithName(CFAllocatorRef allocator, CFStringRef nam

tzName = CFDictionaryGetValue(abbrevs, name);
if (tzName == NULL) {
CFDictionaryRef olson = CFTimeZoneCopyOlsonToWindowsDictionary();
tzName = CFDictionaryGetValue(olson, name);
CFRelease(olson);
tzName = _CFTimeZoneCopyWindowsNameForOlsonName(name);
} else {
tzName = CFRetain(tzName);
}

CFRelease(abbrevs);

if (tzName) {
__CFTimeZoneGetOffset(tzName, &offset);
CFRelease(tzName);
// TODO: handle DST
result = __CFTimeZoneCreateFixed(allocator, offset, name, 0);
}
Expand Down
Loading