gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 09:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix autoirelease pool management errors

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36322 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2013-03-10 10:54:39 +00:00
parent d00afefed0
commit b9d958719e
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Source/NSFileManager.m
View file

@ -679,7 +679,7 @@ static NSStringEncoding defaultEncoding;
NSString *n = [a1 objectAtIndex: index]; NSString *n = [a1 objectAtIndex: index];
NSString *p1; NSString *p1;
NSString *p2; NSString *p2;
NSAutoreleasePool *pool = [NSAutoreleasePool new]; CREATE_AUTORELEASE_POOL(pool);
p1 = [path1 stringByAppendingPathComponent: n]; p1 = [path1 stringByAppendingPathComponent: n];
p2 = [path2 stringByAppendingPathComponent: n]; p2 = [path2 stringByAppendingPathComponent: n];
@ -695,7 +695,7 @@ static NSStringEncoding defaultEncoding;
{ {
ok = [self contentsEqualAtPath: p1 andPath: p2]; ok = [self contentsEqualAtPath: p1 andPath: p2];
} }
[pool drain]; RELEASE(pool);
} }
return ok; return ok;
} }
@ -1489,12 +1489,12 @@ static NSStringEncoding defaultEncoding;
NSString *item; NSString *item;
NSString *next; NSString *next;
BOOL result; BOOL result;
NSAutoreleasePool *arp = [NSAutoreleasePool new]; CREATE_AUTORELEASE_POOL(pool);
item = [contents objectAtIndex: i]; item = [contents objectAtIndex: i];
next = [path stringByAppendingPathComponent: item]; next = [path stringByAppendingPathComponent: item];
result = [self removeFileAtPath: next handler: handler]; result = [self removeFileAtPath: next handler: handler];
[arp drain]; RELEASE(pool);
if (result == NO) if (result == NO)
{ {
return NO; return NO;
@ -2836,7 +2836,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
{ {
NSDirectoryEnumerator *enumerator; NSDirectoryEnumerator *enumerator;
NSString *dirEntry; NSString *dirEntry;
NSAutoreleasePool *pool = [NSAutoreleasePool new]; CREATE_AUTORELEASE_POOL(pool);
enumerator = [self enumeratorAtPath: source]; enumerator = [self enumeratorAtPath: source];
while ((dirEntry = [enumerator nextObject])) while ((dirEntry = [enumerator nextObject]))
@ -2868,6 +2868,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
fromPath: sourceFile fromPath: sourceFile
toPath: destinationFile]) toPath: destinationFile])
{ {
RELEASE(pool);
return NO; return NO;
} }
/* /*
@ -2885,7 +2886,10 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
if (![self _copyPath: sourceFile if (![self _copyPath: sourceFile
toPath: destinationFile toPath: destinationFile
handler: handler]) handler: handler])
return NO; {
RELEASE(pool);
return NO;
}
} }
} }
else if ([fileType isEqual: NSFileTypeRegular]) else if ([fileType isEqual: NSFileTypeRegular])
@ -2893,7 +2897,10 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
if (![self _copyFile: sourceFile if (![self _copyFile: sourceFile
toFile: destinationFile toFile: destinationFile
handler: handler]) handler: handler])
return NO; {
RELEASE(pool);
return NO;
}
} }
else if ([fileType isEqual: NSFileTypeSymbolicLink]) else if ([fileType isEqual: NSFileTypeSymbolicLink])
{ {
@ -2909,6 +2916,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
fromPath: sourceFile fromPath: sourceFile
toPath: destinationFile]) toPath: destinationFile])
{ {
RELEASE(pool);
return NO; return NO;
} }
} }
@ -2925,7 +2933,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
} }
[self changeFileAttributes: attributes atPath: destinationFile]; [self changeFileAttributes: attributes atPath: destinationFile];
} }
[pool drain]; RELEASE(pool);
return YES; return YES;
} }
@ -2937,7 +2945,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
#ifdef HAVE_LINK #ifdef HAVE_LINK
NSDirectoryEnumerator *enumerator; NSDirectoryEnumerator *enumerator;
NSString *dirEntry; NSString *dirEntry;
NSAutoreleasePool *pool = [NSAutoreleasePool new]; CREATE_AUTORELEASE_POOL(pool);
enumerator = [self enumeratorAtPath: source]; enumerator = [self enumeratorAtPath: source];
while ((dirEntry = [enumerator nextObject])) while ((dirEntry = [enumerator nextObject]))
@ -2966,6 +2974,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
fromPath: sourceFile fromPath: sourceFile
toPath: destinationFile] == NO) toPath: destinationFile] == NO)
{ {
RELEASE(pool);
return NO; return NO;
} }
} }
@ -2976,6 +2985,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
toPath: destinationFile toPath: destinationFile
handler: handler] == NO) handler: handler] == NO)
{ {
RELEASE(pool);
return NO; return NO;
} }
} }
@ -2994,6 +3004,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
fromPath: sourceFile fromPath: sourceFile
toPath: destinationFile] == NO) toPath: destinationFile] == NO)
{ {
RELEASE(pool);
return NO; return NO;
} }
} }
@ -3009,13 +3020,14 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
fromPath: sourceFile fromPath: sourceFile
toPath: destinationFile] == NO) toPath: destinationFile] == NO)
{ {
RELEASE(pool);
return NO; return NO;
} }
} }
} }
[self changeFileAttributes: attributes atPath: destinationFile]; [self changeFileAttributes: attributes atPath: destinationFile];
} }
[pool drain]; RELEASE(pool);
return YES; return YES;
#else #else
ASSIGN(_lastError, @"Links not supported on this platform"); ASSIGN(_lastError, @"Links not supported on this platform");