Changeset 2218

Timestamp:

Jun 28, 2007, 1:36:30 AM (15 years ago)

Author:

livings124

Message:

fix some memory leaks and crashing when opening by dragging

Location:

trunk/macosx

Files:

• Controller.m (modified) (4 diffs)
• DragOverlayWindow.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -775 +775 @@
     int canAdd;
     tr_info_t info;
-    do
-    {
-        if ([files count] == 0) //no files left to open
-        {
-            [files release];
-            
-            [self updateTorrentHistory];
-            return;
-        }
-    
-        torrentPath = [[files objectAtIndex: 0] retain];
+    while ([files count] > 0)
+    {
+        torrentPath = [files objectAtIndex: 0];
+        if (tr_torrentParse(fLib, [torrentPath UTF8String], NULL, &info) == TR_OK)
+            break;
+        
+        tr_metainfoFree(&info);
         [files removeObjectAtIndex: 0];
-    } while (tr_torrentParse(fLib, [torrentPath UTF8String], NULL, &info) != TR_OK);
+    }
+    
+    //no files left to open
+    if ([files count] <= 0)
+    {
+        [files release];
+        [self updateTorrentHistory];
+        return;
+    }
 
     NSOpenPanel * panel = [NSOpenPanel openPanel];
@@ -801 +805 @@
     [panel setMessage: @"Select the download folder "];
     
-    NSDictionary * dictionary = [[NSDictionary alloc] initWithObjectsAndKeys: torrentPath, @"Path",
+    NSDictionary * dictionary = [[NSDictionary alloc] initWithObjectsAndKeys: [torrentPath retain], @"Path",
                                     files, @"Files", [NSNumber numberWithBool: delete], @"Delete", nil];
-    [torrentPath release];
+    tr_metainfoFree(&info);
     
     [panel beginSheetForDirectory: nil file: nil types: nil modalForWindow: fWindow modalDelegate: self
@@ -2203 +2207 @@
         NSEnumerator * enumerator = [files objectEnumerator];
         NSString * file;
-        tr_torrent_t * tempTor;
         int canAdd;
         while ((file = [enumerator nextObject]))
@@ -2210 +2213 @@
             if (canAdd == TR_OK)
             {
-                tr_torrentClose(tempTor);
                 [filesToOpen addObject: file];
-                
                 torrent = YES;
             }

trunk/macosx/DragOverlayWindow.m

@@ -85 +85 @@
     tr_info_t info;
     while ((file = [enumerator nextObject]))
+    {
         if (tr_torrentParse(fLib, [file UTF8String], NULL, &info) == TR_OK)
         {
@@ -98 +99 @@
             }
         }
+        tr_metainfoFree(&info);
+    }
     
     if (count <= 0)