Changeset 9580

Timestamp:

Nov 26, 2009, 4:06:49 AM (13 years ago)

Author:

charles

Message:

(trunk gtk) #2110 "allow adding torrents with no trackers" - don't crash when sorting or filtering by tracker. (Reported by Rolcol and jch)

Location:

trunk/gtk

Files:

• tr-core.c (modified) (1 diff)
• tr-window.c (modified) (3 diffs)

trunk/gtk/tr-core.c

@@ -394 +394 @@
                   gpointer       user_data UNUSED )
 {
-    const tr_torrent *ta, *tb;
+    const tr_torrent * ta;
+    const tr_torrent * tb;
+    const tr_info * aInf;
+    const tr_info * bInf;
+    const char * aTracker;
+    const char * bTracker;
 
     gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 );
     gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 );
-    return strcmp( tr_torrentInfo( ta )->trackers[0].announce,
-                   tr_torrentInfo( tb )->trackers[0].announce );
+
+    aInf = tr_torrentInfo( ta );
+    bInf = tr_torrentInfo( tb );
+    aTracker = aInf->trackerCount > 0 ? aInf->trackers[0].announce : NULL;
+    bTracker = bInf->trackerCount > 0 ? bInf->trackers[0].announce : NULL;
+
+    if( !aTracker && !bTracker ) return 0;
+    if( !aTracker ) return -1;
+    if( !bTracker ) return 1;
+    return strcmp( aTracker, bTracker );
 }
 

trunk/gtk/tr-window.c

@@ -366 +366 @@
 static int
 checkFilterText( filter_text_mode_t    filter_text_mode,
-                 const tr_info       * torInfo,
+                 const tr_info       * inf,
                  const char          * text )
 {
@@ -376 +376 @@
     {
         case FILTER_TEXT_MODE_FILES:
-            for( i = 0; i < torInfo->fileCount && !ret; ++i )
+            for( i = 0; i < inf->fileCount && !ret; ++i )
             {
-                pch = g_utf8_casefold( torInfo->files[i].name, -1 );
+                pch = g_utf8_casefold( inf->files[i].name, -1 );
                 ret = !text || strstr( pch, text ) != NULL;
                 g_free( pch );
@@ -385 +385 @@
 
         case FILTER_TEXT_MODE_TRACKER:
-            pch = g_utf8_casefold( torInfo->trackers[0].announce, -1 );
-            ret = !text || ( strstr( pch, text ) != NULL );
-            g_free( pch );
+            if( inf->trackerCount > 0 )
+            {
+                pch = g_utf8_casefold( inf->trackers[0].announce, -1 );
+                ret = !text || ( strstr( pch, text ) != NULL );
+                g_free( pch );
+            }
             break;
 
         default: /* NAME */
-            pch = g_utf8_casefold( torInfo->name, -1 );
+            pch = g_utf8_casefold( inf->name, -1 );
             ret = !text || ( strstr( pch, text ) != NULL );
             g_free( pch );