Changeset 5579

Timestamp:

Apr 10, 2008, 7:02:24 PM (15 years ago)

Author:

charles

Message:

#853: transmission-(daemon|gtk) segfault when querying status

Location:

trunk

Files:

• daemon/server.c (modified) (7 diffs)
• daemon/torrents.c (modified) (2 diffs)
• daemon/torrents.h (modified) (1 diff)
• gtk/ipc.c (modified) (3 diffs)
• libtransmission/ipcparse.c (modified) (2 diffs)
• libtransmission/ipcparse.h (modified) (1 diff)

trunk/daemon/server.c

@@ -487 +487 @@
         if( TORRENT_ID_VALID( tor ) )
         {
-            const tr_info * inf = torrent_info( tor );
-            if( 0 > ipc_addinfo( added, tor, inf, 0 ) )
+            if( 0 > ipc_addinfo( added, tor, torrent_handle( tor ), 0 ) )
             {
                 errnomsg( "failed to build message" );
@@ -545 +544 @@
     if( TORRENT_ID_VALID( tor ) )
     {
-        const tr_info * inf;
         val = ipc_initval( client->ipc, IPC_MSG_INFO, tag, &pk, TYPE_LIST );
         if( NULL == val )
@@ -553 +551 @@
             return;
         }
-        inf = torrent_info( tor );
-        if( 0 > ipc_addinfo( val, tor, inf, 0 ) )
+        if( 0 > ipc_addinfo( val, tor, torrent_handle( tor ), 0 ) )
         {
             errnomsg( "failed to build message" );
@@ -768 +765 @@
 addinfo( benc_val_t * list, int id, int types )
 {
-    const tr_info * inf = torrent_info( id );
-    return inf ? ipc_addinfo( list, id, inf, types ) : 0;
+    tr_torrent * tor = torrent_handle( id );
+    return tor ? ipc_addinfo( list, id, tor, types ) : 0;
 }
 
@@ -775 +772 @@
 addstat( benc_val_t * list, int id, int types )
 {
-    const tr_stat * st = torrent_stat( id );
-    return st ? ipc_addstat( list, id, st, types ) : 0;
+    tr_torrent * tor = torrent_handle( id );
+    return tor ? ipc_addstat( list, id, tor, types ) : 0;
 }
 
@@ -879 +876 @@
     for( ii = 0; val->val.l.count > ii; ii++ )
     {
-        const tr_info * inf;
         hash = &val->val.l.vals[ii];
         if( !tr_bencIsString(hash) || SHA_DIGEST_LENGTH * 2 != hash->val.s.i )
@@ -892 +888 @@
             continue;
         }
-        inf = torrent_info( found );
-        assert( NULL != inf );
-        if( 0 > ipc_addinfo( pkinf, found, inf, IPC_INF_HASH ) )
+        if( 0 > ipc_addinfo( pkinf, found, torrent_handle( found ), IPC_INF_HASH ) )
         {
             errnomsg( "failed to build message" );

trunk/daemon/torrents.c

@@ -231 +231 @@
 }
 
+tr_torrent *
+torrent_handle( int id )
+{
+    const struct tor * tor = idlookup( id );
+    return tor ? tor->tor : NULL;
+}
+   
 const tr_info *
 torrent_info( int id )
 {
-    const struct tor * tor = idlookup( id );
-    return tor ? tr_torrentInfo( tor->tor ) : NULL;
+    return tr_torrentInfo( torrent_handle( id ) );
 }
 
@@ -241 +247 @@
 torrent_stat( int id )
 {
-    struct tor * tor = idlookup( id );
-    return tor ? tr_torrentStat( tor->tor ) : NULL;
+    return tr_torrentStat( torrent_handle( id ) );
 }
 

trunk/daemon/torrents.h

@@ -39 +39 @@
 void         torrent_verify              ( int );
 void         torrent_remove              ( int );
-const tr_info  * torrent_info          ( int );
-const tr_stat  * torrent_stat          ( int );
+tr_torrent     * torrent_handle          ( int );
+const tr_info  * torrent_info            ( int );
+const tr_stat  * torrent_stat            ( int );
 int          torrent_lookup              ( const uint8_t * );
 void       * torrent_iter                ( void *, int * );

trunk/gtk/ipc.c

@@ -619 +619 @@
 
 static int
-addinfo( TrTorrent * tor, enum ipc_msg msgid, int torid, int types,
+addinfo( TrTorrent * gtor, enum ipc_msg msgid, int torid, int types,
          tr_benc * val )
 {
+    tr_torrent * tor = tr_torrent_handle( gtor );
+
     if( IPC_MSG_INFO == msgid )
-    {
-        const tr_info * inf = tr_torrent_info( tor );
-        return ipc_addinfo( val, torid, inf, types );
-    }
+        return ipc_addinfo( val, torid, tor, types );
     else
-    {
-        const tr_stat * st = tr_torrent_stat( tor );
-        return ipc_addstat( val, torid, st, types );
-    }
+        return ipc_addstat( val, torid, tor, types );
 }
 
@@ -794 +790 @@
     int                    ii, torid;
     TrTorrent            * tor;
-    const tr_info        * inf;
     uint8_t              * buf;
     size_t                 size;
@@ -820 +815 @@
             continue;
         }
-        inf = tr_torrent_info( tor );
-        if( 0 > ipc_addinfo( pkval, torid, inf, IPC_INF_HASH ) )
+        if( 0 > ipc_addinfo( pkval, torid, tr_torrent_handle( tor ), IPC_INF_HASH ) )
         {
             tr_bencFree( &packet );

trunk/libtransmission/ipcparse.c

@@ -553 +553 @@
 ipc_addinfo( tr_benc         * list,
              int               torrent_id,
-             const tr_info   * inf,
+             tr_torrent      * tor,
              int               types )
 {
@@ -559 +559 @@
     int          ii, jj, kk;
     tr_file_index_t ff;
+    const tr_info * inf = tr_torrentInfo( tor );
 
     /* always send torrent id */

trunk/libtransmission/ipcparse.h

@@ -171 +171 @@
                                     const int             * ids );
 
-int          ipc_addinfo   ( struct tr_benc *, int,
-                             const struct tr_info *, int );
+struct tr_torrent;
 
-struct tr_torrent;
+int          ipc_addinfo   ( struct tr_benc     * appendme_list,
+                             int                  torrent_id,
+                             struct tr_torrent  * tor,
+                             int                  info_types );
 
 int          ipc_addstat   ( struct tr_benc     * appendme_list,