Skip to content

Initialize _allBundles in _CFBundleCopyAllBundles before trying to copy it. #5269

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −11
Open

Initialize _allBundles in _CFBundleCopyAllBundles before trying to copy it. #5269

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
31 changes: 20 additions & 11 deletions Sources/CoreFoundation/CFBundle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,22 +255,26 @@ CF_PRIVATE CFURLRef _CFURLCreateResolvedDirectoryWithString(CFAllocatorRef alloc
#pragma mark -
#pragma mark Bundle Tables

static void __CFBundleCreateAllBundlesArrayLocked() {
CFArrayCallBacks callbacks = kCFTypeArrayCallBacks;
#if TARGET_OS_OSX
if (_useUnsafeUnretainedTables()) {
callbacks.retain = NULL;
callbacks.release = NULL;
}
#endif
// The _allBundles array holds a strong reference on the bundle.
// It does this to prevent a race on bundle deallocation / creation. See: <rdar://problem/6606482> CFBundle isn't thread-safe in RR mode
// Also, the existence of the CFBundleGetBundleWithIdentifier / CFBundleGetAllBundles API means that any bundle we hand out from there must be permanently retained, or callers will potentially have an object that can be deallocated out from underneath them.
_allBundles = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &callbacks);
}

static void _CFBundleAddToTablesLocked(CFBundleRef bundle, CFStringRef bundleID) {
if (bundle->_isUnique) return;

// Add to the _allBundles list
if (!_allBundles) {
CFArrayCallBacks callbacks = kCFTypeArrayCallBacks;
#if TARGET_OS_OSX
if (_useUnsafeUnretainedTables()) {
callbacks.retain = NULL;
callbacks.release = NULL;
}
#endif
// The _allBundles array holds a strong reference on the bundle.
// It does this to prevent a race on bundle deallocation / creation. See: <rdar://problem/6606482> CFBundle isn't thread-safe in RR mode
// Also, the existence of the CFBundleGetBundleWithIdentifier / CFBundleGetAllBundles API means that any bundle we hand out from there must be permanently retained, or callers will potentially have an object that can be deallocated out from underneath them.
_allBundles = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &callbacks);
__CFBundleCreateAllBundlesArrayLocked();
}
CFArrayAppendValue(_allBundles, bundle);

Expand Down Expand Up @@ -1795,6 +1799,11 @@ CF_EXPORT CFArrayRef _CFBundleCopyAllBundles(void) {
_CFBundleEnsureAllBundlesUpToDate();
CFBundleRef main = CFBundleGetMainBundle();
_CFMutexLock(&CFBundleGlobalDataLock);
// There is a chance that `_allBundles` haven't been initiated
// if no one called `CFBundleCreate()` yet
if (!_allBundles) {
__CFBundleCreateAllBundlesArrayLocked();
}
// _allBundles does not include the main bundle, so insert it here.
CFMutableArrayRef bundles = CFArrayCreateMutableCopy(kCFAllocatorSystemDefault, CFArrayGetCount(_allBundles) + 1, _allBundles);
_CFMutexUnlock(&CFBundleGlobalDataLock);
Expand Down