Changeset 3573

Timestamp:

Oct 26, 2007, 3:02:35 AM (15 years ago)

Author:

charles

Message:

Quick & dirty fix to crasher ticket #415.

Location:

branches/0.9x

Files:

• NEWS (modified) (1 diff)
• gtk/tr_core.c (modified) (1 diff)
• libtransmission/fastresume.c (modified) (5 diffs)
• libtransmission/fastresume.h (modified) (1 diff)
• libtransmission/torrent.c (modified) (8 diffs)
• libtransmission/transmission.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (2 diffs)

branches/0.9x/NEWS

@@ -12 +12 @@
 - gtk:
    + Fix 0.90 packaging errors
+   + Fix 0.90 assertion failure: "destination != (void*)0"
 
 0.90 (2007/10/23)

branches/0.9x/gtk/tr_core.c

@@ -448 +448 @@
     path = getdownloaddir( );
 
-    torrents = tr_loadTorrents ( self->handle, NULL, paused, &count );
+    torrents = tr_loadTorrents ( self->handle, path, paused, &count );
     for( i=0; i<count; ++i )
         tr_core_insert( self, tr_torrent_new_preexisting( torrents[i] ) );

branches/0.9x/libtransmission/fastresume.c

@@ -331 +331 @@
 
 static int
-loadFallbackDestination( tr_torrent * tor, FILE * fp )
+loadDestination( tr_torrent * tor, FILE * fp, const char * destination, int argIsFallback )
 {
     int pathlen = 0;
     char path[MAX_PATH_LENGTH];
-    const int haveDestination = tor->destination && *tor->destination;
 
     for( ;; ) {
@@ -348 +347 @@
     path[pathlen] = '\0';
 
-    if( pathlen && !haveDestination ) {
-        tr_free( tor->destination );
-        tor->destination = tr_strdup( path );
-    }
+    if( argIsFallback )
+        tor->destination = tr_strdup( pathlen ? path : destination );
+    else
+        tor->destination = tr_strdup( destination && *destination ? destination : path );
 
     return TR_OK;
@@ -526 +525 @@
 static uint64_t
 fastResumeLoadImpl ( tr_torrent   * tor,
-                     tr_bitfield  * uncheckedPieces )
+                     tr_bitfield  * uncheckedPieces,
+                     const char   * destination,
+                     int            argIsFallback )
 {
     char      path[MAX_PATH_LENGTH];
@@ -630 +631 @@
             case FR_ID_DESTINATION:
                 {
-                    const int rret = loadFallbackDestination( tor, file );
+                    const int rret = loadDestination( tor, file, destination, argIsFallback );
 
                     if( rret && ( feof(file) || ferror(file) ) )
@@ -773 +774 @@
 uint64_t
 tr_fastResumeLoad( tr_torrent   * tor,
-                   tr_bitfield  * uncheckedPieces )
-{
-    const uint64_t ret = fastResumeLoadImpl( tor, uncheckedPieces );
+                   tr_bitfield  * uncheckedPieces,
+                   const char   * destination,
+                   int            argIsFallback )
+{
+    const uint64_t ret = fastResumeLoadImpl( tor, uncheckedPieces, destination, argIsFallback );
 
     if( ! ( ret & TR_FR_PROGRESS ) )
         tr_bitfieldAddRange( uncheckedPieces, 0, tor->info.pieceCount );
 
+    if( !tor->destination )
+        tor->destination = tr_strdup( destination );
+
     return ret;
 }

branches/0.9x/libtransmission/fastresume.h

@@ -46 +46 @@
  */
 uint64_t tr_fastResumeLoad( tr_torrent          * tor,
-                            struct tr_bitfield  * uncheckedPieces );
+                            struct tr_bitfield  * uncheckedPieces,
+                            const char          * destination,
+                            int                   destinationIsFallback );
 
 #endif

branches/0.9x/libtransmission/torrent.c

@@ -258 +258 @@
                  tr_torrent * tor,
                  const char * destination,
+                 int          destinationIsFallback,
                  int          isPaused )
 {
@@ -267 +268 @@
    
     tr_globalLock( h );
-
-    tor->destination = tr_strdup( destination );
 
     tor->handle   = h;
@@ -340 +339 @@
     uncheckedPieces = tr_bitfieldNew( tor->info.pieceCount );
 
-    loaded = tr_fastResumeLoad( tor, uncheckedPieces );
+    loaded = tr_fastResumeLoad( tor, uncheckedPieces, destination, destinationIsFallback );
     assert( tor->destination != NULL );
 
@@ -450 +449 @@
 }
  
+static tr_torrent *
+tr_torrentInitImpl( tr_handle   * h,
+                    const char  * path,
+                    const char  * destination,
+                    int           destinationIsFallback,
+                    int           isPaused,
+                    int         * error )
+{
+    int val;
+    int tmpError;
+    tr_torrent * tor = NULL;
+
+    if( !error )
+         error = &tmpError;
+
+    if(( val = tr_torrentParse( h, path, destination, NULL )))
+        *error = val;
+    else if(!(( tor = tr_new0( tr_torrent, 1 ))))
+        *error = TR_EOTHER;
+    else {
+        tr_metainfoParseFile( &tor->info, h->tag, path, TRUE );
+        torrentRealInit( h, tor, destination, destinationIsFallback, isPaused );
+    }
+
+    return tor;
+}
+
 tr_torrent *
 tr_torrentInit( tr_handle   * h,
@@ -457 +483 @@
                 int         * error )
 {
-    int val;
-    int tmpError;
-    tr_torrent * tor = NULL;
-
-    if( !error )
-         error = &tmpError;
-
-    if(( val = tr_torrentParse( h, path, destination, NULL )))
-        *error = val;
-    else if(!(( tor = tr_new0( tr_torrent, 1 ))))
-        *error = TR_EOTHER;
-    else {
-        tr_metainfoParseFile( &tor->info, h->tag, path, TRUE );
-        torrentRealInit( h, tor, destination, isPaused );
-    }
-
-    return tor;
+    return tr_torrentInitImpl( h, path, destination, FALSE, isPaused, error );
+}
+
+tr_torrent *
+tr_torrentLoad( tr_handle    * h,
+                const char   * metainfoFilename,
+                const char   * destination,
+                int            isPaused,
+                int          * error )
+{
+    return tr_torrentInitImpl( h, metainfoFilename, destination, TRUE, isPaused, error );
 }
 
@@ -521 +541 @@
     else {
         tr_metainfoParseHash( &tor->info, h->tag, hashStr );
-        torrentRealInit( h, tor, destination, isPaused );
+        torrentRealInit( h, tor, destination, FALSE, isPaused );
     }
 
@@ -574 +594 @@
     else {
         tr_metainfoParseData( &tor->info, h->tag, data, size, TRUE );
-        torrentRealInit( h, tor, destination, isPaused );
+        torrentRealInit( h, tor, destination, FALSE, isPaused );
     }
 
@@ -1304 +1324 @@
     return ret;
 }
-

branches/0.9x/libtransmission/transmission.c

@@ -328 +328 @@
 tr_torrent **
 tr_loadTorrents ( tr_handle   * h,
-                  const char  * destination,
+                  const char  * fallbackDestination,
                   int           isPaused,
                   int         * setmeCount )
@@ -351 +351 @@
                 char path[MAX_PATH_LENGTH];
                 tr_buildPath( path, sizeof(path), torrentDir, d->d_name, NULL );
-                tor = tr_torrentInit( h, path, destination, isPaused, NULL );
+                tor = tr_torrentLoad( h, path, fallbackDestination, isPaused, NULL );
                 if( tor != NULL ) {
                     tr_list_append( &list, tor );

branches/0.9x/libtransmission/transmission.h

@@ -308 +308 @@
  */
 tr_torrent ** tr_loadTorrents ( tr_handle  * h,
-                                const char   * destination,
+                                const char   * fallback_destination,
                                 int            isPaused,
                                 int          * setmeCount );
@@ -330 +330 @@
                              const char   * metainfo_filename,
                              const char   * destination,
+                             int            isPaused,
+                             int          * setme_error );
+
+/* This is a stupid hack to fix #415.  Probably I should fold all
+ * these torrent constructors into a single function that takes
+ * a function object to hold all these esoteric arguments. */
+tr_torrent * tr_torrentLoad( tr_handle    * handle,
+                             const char   * metainfo_filename,
+                             const char   * fallback_destination,
                              int            isPaused,
                              int          * setme_error );