Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed two naughty, naughty mutations of collections being enumerated thanks to run-time warnings generated when linking to OS X 10.5 SDK.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1696 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2008-07-18 18:45:30 +00:00
parent 0b7f46ef3c
commit 4d7443c17c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/OOShipRegistry.m
View File

@ -279,16 +279,19 @@ static NSString * const kDefaultDemoShip = @"coriolis-station";
{
NSEnumerator *enumerator = nil;
NSString *key = nil;
NSArray *initialDemoShips = nil;
NSMutableArray *demoShips = nil;
[_demoShips release];
_demoShips = nil;
demoShips = [[[ResourceManager arrayFromFilesNamed:@"demoships.plist"
inFolder:@"Config"
andMerge:YES] mutableCopy] autorelease];
initialDemoShips = [ResourceManager arrayFromFilesNamed:@"demoships.plist"
inFolder:@"Config"
andMerge:YES];
demoShips = [NSMutableArray arrayWithArray:[initialDemoShips mutableCopy]];
for (enumerator = [demoShips objectEnumerator]; (key = [enumerator nextObject]); )
// Note: iterate over initialDemoShips to avoid mutating the collection being enu,erated.
for (enumerator = [initialDemoShips objectEnumerator]; (key = [enumerator nextObject]); )
{
if (![key isKindOfClass:[NSString class]] || [self shipInfoForKey:key] == nil)
{
@ -350,8 +353,9 @@ static NSString * const kDefaultDemoShip = @"coriolis-station";
}
// Convert role sets to immutable form, and build cache entry.
// Note: we iterate over a copy of the keys to avoid mutating while iterating.
cacheEntry = [NSMutableDictionary dictionaryWithCapacity:[probabilitySets count]];
for (roleEnum = [probabilitySets keyEnumerator]; (role = [roleEnum nextObject]); )
for (roleEnum = [[probabilitySets allKeys] objectEnumerator]; (role = [roleEnum nextObject]); )
{
pset = [probabilitySets objectForKey:role];
pset = [[pset copy] autorelease];