[eyetunes commit] r266 - EyeTunes/trunk

[codesite...@google.com]

Author: ruotger...@berlin.de
Date: Fri Aug 29 07:39:33 2008
New Revision: 266

Modified:
EyeTunes/trunk/ETAppleEventObject.m
EyeTunes/trunk/ETEyeTunes.m

Log:
fixed several issues the clang static analyser found:
* Memory Leak: ETEyeTunes.m:395
* Use-After-Release: ETAppleEventObject.m:1244
* dead store: ETAppleEventObject.m:1240

Modified: EyeTunes/trunk/ETAppleEventObject.m
==============================================================================
--- EyeTunes/trunk/ETAppleEventObject.m (original)
+++ EyeTunes/trunk/ETAppleEventObject.m Fri Aug 29 07:39:33 2008
@@ -1218,7 +1218,6 @@
FSRef fsRef;
DescType resultType;
Size resultSize;
- NSString *urlString = nil;

AppleEvent *replyEvent = [self getPropertyOfType:descType];

@@ -1236,14 +1235,13 @@

/* Convert Alias to NSString */
CFURLRef resolvedURL = CFURLCreateFromFSRef(NULL, &fsRef);
- if (resolvedURL) {
- urlString = [(NSURL *)resolvedURL absoluteString];
- CFRelease(resolvedURL);
- }

NSArray *valueAndDump = [NSArray arrayWithObjects:(NSURL *)resolvedURL,
[ETAppleEventObject debugHexDump:(void *)&fsRef ofLength:sizeof(fsRef)],
nil];

+ if (resolvedURL) {
+ CFRelease(resolvedURL);
+ }
AEDisposeDesc(replyEvent);
free(replyEvent);

Modified: EyeTunes/trunk/ETEyeTunes.m
==============================================================================
--- EyeTunes/trunk/ETEyeTunes.m (original)
+++ EyeTunes/trunk/ETEyeTunes.m Fri Aug 29 07:39:33 2008
@@ -385,7 +385,9 @@
gizmo = @"'----':@, pTrm:'utxt'(@)";
}
else {
- gizmo = [NSString stringWithFormat:@"'----':@, pTrm:'utxt'(@), pAre:%@",
UTCreateStringForOSType(typeCode)];
+ CFStringRef typeCodeString = UTCreateStringForOSType(typeCode);
+ gizmo = [NSString stringWithFormat:@"'----':@, pTrm:'utxt'(@), pAre:%@",
typeCodeString];
+ CFRelease(typeCodeString);
}

err = AEBuildAppleEvent(iTunesSignature,