gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore use of flag to prevent infinite recursion.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@19115 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2004-04-15 14:11:12 +00:00
parent 3f856d123d
commit 367bb36d02
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/NSUserDefaults.m
View file

@ -213,6 +213,8 @@ static void updateCache(NSUserDefaults *self)
*/ */
@implementation NSUserDefaults: NSObject @implementation NSUserDefaults: NSObject
static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
+ (void) initialize + (void) initialize
{ {
if (self == [NSUserDefaults class]) if (self == [NSUserDefaults class])
@ -251,6 +253,8 @@ static void updateCache(NSUserDefaults *self)
[sharedDefaults synchronize]; // Ensure changes are written. [sharedDefaults synchronize]; // Ensure changes are written.
regDefs = RETAIN([sharedDefaults->_tempDomains regDefs = RETAIN([sharedDefaults->_tempDomains
objectForKey: NSRegistrationDomain]); objectForKey: NSRegistrationDomain]);
setSharedDefaults = NO;
DESTROY(sharedDefaults); DESTROY(sharedDefaults);
if (regDefs != nil) if (regDefs != nil)
{ {
@ -412,12 +416,19 @@ static void updateCache(NSUserDefaults *self)
*/ */
[classLock lock]; [classLock lock];
if (sharedDefaults != nil)
/*
* NB. The use of the setSharedDefaults flag ensures that a recursive
* call to this method is quietly suppressed ... so we get a more
* manageable problem.
*/
if (setSharedDefaults == YES)
{ {
RETAIN(sharedDefaults); RETAIN(sharedDefaults);
[classLock unlock]; [classLock unlock];
return AUTORELEASE(sharedDefaults); return AUTORELEASE(sharedDefaults);
} }
setSharedDefaults = YES;
// Create new sharedDefaults (NOTE: Not added to the autorelease pool!) // Create new sharedDefaults (NOTE: Not added to the autorelease pool!)
sharedDefaults = [[self alloc] init]; sharedDefaults = [[self alloc] init];