Changeset 2114

Timestamp:

Jun 17, 2007, 4:10:26 AM (15 years ago)

Author:

charles

Message:

• fix memory leaks in makemeta
• faster hashing of files
• more gui improvements in gtk torrent creator

Location:

branches/file_selection

Files:

• gtk/make-meta-ui.c (modified) (2 diffs)
• libtransmission/makemeta.c (modified) (4 diffs)

branches/file_selection/gtk/make-meta-ui.c

@@ -49 +49 @@
 }
 MakeMetaUI;
+
+static void
+freeMetaUI( gpointer p )
+{
+    MakeMetaUI * ui = (MakeMetaUI *) p;
+    tr_metaInfoBuilderFree( ui->builder );
+    memset( ui, ~0, sizeof(MakeMetaUI) );
+    g_free( ui );
+}
 
 static void
@@ -216 +225 @@
                                      NULL );
     g_signal_connect( d, "response", G_CALLBACK(response_cb), ui );
-    g_object_set_data_full( G_OBJECT(d), "ui", ui, g_free );
+    g_object_set_data_full( G_OBJECT(d), "ui", ui, freeMetaUI );
     ui->dialog = d;
 

branches/file_selection/libtransmission/makemeta.c

@@ -195 +195 @@
     for( i=0; i<builder->fileCount; ++i )
         tr_free( builder->files[i] );
+    tr_free( builder->files );
+    tr_free( builder->fileLengths );
     tr_free( builder->top );
     tr_free( builder->comment );
@@ -215 +217 @@
     uint8_t *buf = malloc( b->pieceSize );
     size_t totalRemain;
+    FILE * fp;
 
     b->pieceIndex = 0;
     totalRemain = b->totalSize;
+    fp = fopen( b->files[fileIndex], "rb" );
     while ( totalRemain )
     {
@@ -228 +232 @@
         while( pieceRemain )
         {
-            FILE * fp = fopen( b->files[fileIndex], "rb" );
             const size_t n_this_pass = MIN( (b->fileLengths[fileIndex] - off), pieceRemain );
-            if( off )
-                fseek( fp, off, SEEK_SET );
             fread( bufptr, 1, n_this_pass, fp );
             bufptr += n_this_pass;
             off += n_this_pass;
             pieceRemain -= n_this_pass;
-            fclose( fp );
-
             if( off == b->fileLengths[fileIndex] ) {
                 off = 0;
-                ++fileIndex;
+                fclose( fp );
+                fp = NULL;
+                if( ++fileIndex < b->fileCount ) {
+                    fp = fopen( b->files[fileIndex], "rb" );
+                }
             }
         }
@@ -259 +262 @@
     assert( b->abortFlag || (walk-ret == (int)(SHA_DIGEST_LENGTH*b->pieceCount)) );
     assert( b->abortFlag || !totalRemain );
+    assert( fp == NULL );
 
     free( buf );