analyze

Author: chamspan

iLcatraz/FileResponse.m

@@ -10,7 +10,8 @@
 
 @implementation FileResponse
 - (id)initWithFilePath:(NSString *)aFilePath andLocation:(NSString*)location forConnection:(HTTPConnection *)aConnection{
-    if (self==[super initWithFilePath:aFilePath forConnection:aConnection]){
+    self=[super initWithFilePath:aFilePath forConnection:aConnection];
+    if (self!=NULL){
         headers = [NSDictionary dictionaryWithObjectsAndKeys:location,@"X-iTunes-Location",nil];
     };
     return self;

iLcatraz/ITunesService.m

@@ -660,7 +660,7 @@ - (NSInteger) resultAsCount:(NSString *)code
     NSAppleEventDescriptor* returnDescriptor = [self resultForCode:code];
     return (NSInteger)[returnDescriptor int32Value];
 }
-- (NSString*) resultAsPath:(NSString *)code
+- (NSString*) copyResultAsString:(NSString *)code
 {
     NSAppleEventDescriptor* descriptor=[self resultForCode:code];
     CFStringRef posixPath = NULL;
@@ -689,7 +689,7 @@ - (NSString*) resultAsPath:(NSString *)code
                                             kCFURLPOSIXPathStyle );
         CFRelease( myURLRef );
     }
-    
+    //TODO: Memory leak, i do not know how to avoid
     return (__bridge NSString *)posixPath;
 }
 
@@ -728,7 +728,7 @@ - (NSString*) jsonTrackWithID:(NSString*) pid {
     return [self jsonForCode:[NSString stringWithFormat:@"tell application \"iTunes\"\n properties of first item of (tracks whose persistent ID is \"%@\")\n end tell",pid]];
 }
 - (NSString*) locationForTrackWithID:(NSString*) pid{
-    return [self resultAsPath:[NSString stringWithFormat:@"tell application \"iTunes\"\n location of first item of (tracks whose persistent ID is \"%@\")\n end tell",pid]];
+    return [self copyResultAsString:[NSString stringWithFormat:@"tell application \"iTunes\"\n location of first item of (tracks whose persistent ID is \"%@\")\n end tell",pid]];
 }
 
 //v2
@@ -745,7 +745,7 @@ - (NSString*) jsonTrackWithID:(NSString*)tid ofPlaysitWithID:(NSString*)pid{
     return [self jsonForCode:[NSString stringWithFormat:@"tell application \"iTunes\"\n properties of first item of (tracks of (first item  of (playlists whose persistent ID is \"%@\")) whose  persistent ID is \"%@\")\n end tell",pid,tid]];
 };
 - (NSString*) pathForTrackWithID:(NSString*)tid ofPlaysitWithID:(NSString*)pid{
-    return [self resultAsPath:[NSString stringWithFormat:@"tell application \"iTunes\"\n location of first item of (tracks of (first item  of (playlists whose persistent ID is \"%@\")) whose  persistent ID is \"%@\")\n end tell",pid,tid]];
+    return [self copyResultAsString:[NSString stringWithFormat:@"tell application \"iTunes\"\n location of first item of (tracks of (first item  of (playlists whose persistent ID is \"%@\")) whose  persistent ID is \"%@\")\n end tell",pid,tid]];
 };
 - (NSString*) locationForTrackPath:(NSString*)path{
      NSArray *components=[path componentsSeparatedByString:@"iTunes Media/"];