stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-17 10:11:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify OS X bundle resource discovery, fix a sigsegv

Browse source
This commit is contained in:
yoshibot 2016-05-17 22:56:49 -05:00
parent a12733f480
commit 928c6acf4b
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/sdl/macosx/mac_resources.c
View file

@ -9,23 +9,21 @@ void OSX_GetResourcesPath(char * buffer)
mainBundle = CFBundleGetMainBundle(); mainBundle = CFBundleGetMainBundle();
if (mainBundle) if (mainBundle)
{ {
const int BUF_SIZE = 256; // because we somehow always know that
CFURLRef appUrlRef = CFBundleCopyBundleURL(mainBundle); CFURLRef appUrlRef = CFBundleCopyBundleURL(mainBundle);
CFStringRef macPath = CFURLCopyFileSystemPath(appUrlRef, kCFURLPOSIXPathStyle); CFStringRef macPath = CFURLCopyFileSystemPath(appUrlRef, kCFURLPOSIXPathStyle);
CFStringRef resources = CFStringCreateWithCString(kCFAllocatorMalloc, "/Contents/Resources", kCFStringEncodingASCII);
const void* rawarray[2] = {macPath, resources}; const char* rawPath = CFStringGetCStringPtr(macPath, kCFStringEncodingASCII);
CFArrayRef array = CFArrayCreate(kCFAllocatorMalloc, rawarray, 2, NULL);
CFStringRef separator = CFStringCreateWithCString(kCFAllocatorMalloc, "", kCFStringEncodingASCII); if (CFStringGetLength(macPath) + strlen("/Contents/Resources") < BUF_SIZE)
CFStringRef fullPath = CFStringCreateByCombiningStrings(kCFAllocatorMalloc, array, separator); {
const char * path = CFStringGetCStringPtr(fullPath, kCFStringEncodingASCII); strcpy(buffer, rawPath);
strcpy(buffer, path); strcat(buffer, "/Contents/Resources");
CFRelease(fullPath); }
path = NULL;
CFRelease(array);
CFRelease(resources);
CFRelease(macPath); CFRelease(macPath);
CFRelease(appUrlRef); CFRelease(appUrlRef);
//CFRelease(mainBundle);
CFRelease(separator);
} }
CFRelease(mainBundle);
} }