gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-11 08:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changes to avoid recursion if NSLog() is called during NSUserDefaults initialisation

Browse source
This commit is contained in:
rfm 2024-11-29 10:42:40 +00:00
parent e542cb7dff
commit 672fe7f909
1 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
Source/NSUserDefaults.m
View file

@ -99,6 +99,7 @@ static NSDictionary *argumentsDictionary = nil;
static NSString *bundleIdentifier = nil; static NSString *bundleIdentifier = nil;
static NSRecursiveLock *classLock = nil; static NSRecursiveLock *classLock = nil;
static NSLock *syncLock = nil; static NSLock *syncLock = nil;
static BOOL initializing = NO;
/* Flag to say whether the sharedDefaults variable has been set up by a /* Flag to say whether the sharedDefaults variable has been set up by a
* call to the +standardUserDefaults method. If this is YES but the variable * call to the +standardUserDefaults method. If this is YES but the variable
@ -695,6 +696,7 @@ newLanguages(NSArray *oldNames)
NSString *key; NSString *key;
beenHere = YES; beenHere = YES;
initializing = YES;
nextObjectSel = @selector(nextObject); nextObjectSel = @selector(nextObject);
objectForKeySel = @selector(objectForKey:); objectForKeySel = @selector(objectForKey:);
addSel = @selector(addEntriesFromDictionary:); addSel = @selector(addEntriesFromDictionary:);
@ -712,16 +714,19 @@ newLanguages(NSArray *oldNames)
[self registerAtExit]; [self registerAtExit];
key = [GSPrivateInfoDictionary(nil) objectForKey: @"CFBundleIdentifier"]; key = [GSPrivateInfoDictionary(nil) objectForKey: @"CFBundleIdentifier"];
if ([key isKindOfClass: [NSString class]]) if (NO == [key isKindOfClass: [NSString class]])
{
bundleIdentifier = [key copy];
}
else
{ {
/* No bundle identifier found: use the process name instead. /* No bundle identifier found: use the process name instead.
*/ */
bundleIdentifier = [[[NSProcessInfo processInfo] processName] copy]; key = [[NSProcessInfo processInfo] processName];
if (NO == [key isKindOfClass: [NSString class]])
{
fprintf(stderr, "+[NSUserDefaults initialize] unable to"
" determine bundle identfier or process name.\n");
key = nil;
}
} }
bundleIdentifier = [key copy];
/* Initialise the defaults flags to take values from the /* Initialise the defaults flags to take values from the
* process arguments. These are otherwise set in updateCache() * process arguments. These are otherwise set in updateCache()
@ -790,6 +795,7 @@ newLanguages(NSArray *oldNames)
[self _createArgumentDictionary: args]; [self _createArgumentDictionary: args];
LEAVE_POOL LEAVE_POOL
initializing = NO;
} }
} }
@ -1049,8 +1055,11 @@ newLanguages(NSArray *oldNames)
*/ */
[defs->_searchList addObject: GSPrimaryDomain]; [defs->_searchList addObject: GSPrimaryDomain];
[defs->_searchList addObject: NSArgumentDomain]; [defs->_searchList addObject: NSArgumentDomain];
[defs->_searchList addObject: bundleIdentifier]; if (bundleIdentifier)
[defs persistentDomainForName: bundleIdentifier]; {
[defs->_searchList addObject: bundleIdentifier];
[defs persistentDomainForName: bundleIdentifier];
}
[defs->_searchList addObject: NSGlobalDomain]; [defs->_searchList addObject: NSGlobalDomain];
[defs persistentDomainForName: NSGlobalDomain]; [defs persistentDomainForName: NSGlobalDomain];
[defs->_searchList addObject: GSConfigDomain]; [defs->_searchList addObject: GSConfigDomain];
@ -2331,16 +2340,24 @@ GSPrivateDefaultsFlag(GSUserDefaultFlagType type)
{ {
if (nil == classLock) if (nil == classLock)
{ {
/* The order of +initialise of NSUserDefaults is such that our if (initializing)
* flags[] array is set up directly from the process arguments {
* before classLock is created, so once * that variable exists fprintf(stderr, "GSPrivateDefaultsFlag() called within"
* this function may be used safely. " +[NSUserDefaults initialize] always returns NO.\n");
*/ }
[NSUserDefaults class]; else
if (NO == hasSharedDefaults) {
{ /* The order of +initialise of NSUserDefaults is such that our
[NSUserDefaults standardUserDefaults]; * flags[] array is set up directly from the process arguments
} * before classLock is created, so once that variable exists
* this function may be used safely.
*/
[NSUserDefaults class];
if (NO == hasSharedDefaults)
{
[NSUserDefaults standardUserDefaults];
}
}
} }
return flags[type]; return flags[type];
} }