Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-09 19:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add defensive checks to MacOSStringCompare

Browse Source
This commit is contained in:
Jonathan G Rennison 2019-04-19 02:06:38 +01:00
parent ede88aa6cd
commit da2528cbe2
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/os/macosx/string_osx.cpp
View File

@ -15,6 +15,7 @@
#include "../../strings_func.h" #include "../../strings_func.h"
#include "../../table/control_codes.h" #include "../../table/control_codes.h"
#include "../../fontcache.h" #include "../../fontcache.h"
#include "../../scope.h"
#include "macos.h" #include "macos.h"
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
@ -301,16 +302,23 @@ int MacOSStringCompare(const char *s1, const char *s2)
static bool supported = MacOSVersionIsAtLeast(10, 5, 0); static bool supported = MacOSVersionIsAtLeast(10, 5, 0);
if (!supported) return 0; if (!supported) return 0;
if (_osx_locale == nullptr) return 0;
CFStringCompareFlags flags = kCFCompareCaseInsensitive | kCFCompareNumerically | kCFCompareLocalized | kCFCompareWidthInsensitive | kCFCompareForcedOrdering; CFStringCompareFlags flags = kCFCompareCaseInsensitive | kCFCompareNumerically | kCFCompareLocalized | kCFCompareWidthInsensitive | kCFCompareForcedOrdering;
CFStringRef cf1 = CFStringCreateWithCString(kCFAllocatorDefault, s1, kCFStringEncodingUTF8); CFStringRef cf1 = CFStringCreateWithCString(kCFAllocatorDefault, s1, kCFStringEncodingUTF8);
if (cf1 == nullptr) return 0;
auto guard1 = scope_guard([&]() {
CFRelease(cf1);
});
CFStringRef cf2 = CFStringCreateWithCString(kCFAllocatorDefault, s2, kCFStringEncodingUTF8); CFStringRef cf2 = CFStringCreateWithCString(kCFAllocatorDefault, s2, kCFStringEncodingUTF8);
if (cf2 == nullptr) return 0;
auto guard2 = scope_guard([&]() {
CFRelease(cf2);
});
CFComparisonResult res = CFStringCompareWithOptionsAndLocale(cf1, cf2, CFRangeMake(0, CFStringGetLength(cf1)), flags, _osx_locale); CFComparisonResult res = CFStringCompareWithOptionsAndLocale(cf1, cf2, CFRangeMake(0, CFStringGetLength(cf1)), flags, _osx_locale);
CFRelease(cf1);
CFRelease(cf2);
return (int)res + 2; return (int)res + 2;
} }