Changeset 13504

Timestamp:

Sep 19, 2012, 5:11:19 AM (10 years ago)

Author:

jordan

Message:

(trunk, libt) #4932 'crash on magnet links' -- fixed.

Location:

trunk/libtransmission

Files:

• completion.c (modified) (1 diff)
• peer-msgs.c (modified) (1 diff)
• rpcimpl.c (modified) (1 diff)

trunk/libtransmission/completion.c

@@ -272 +272 @@
 {
     void * ret;
+    tr_piece_index_t n;
     tr_bitfield pieces;
-    const tr_piece_index_t n = cp->tor->info.pieceCount;
+
+    assert( tr_torrentHasMetadata( cp->tor ) );
+
+    n = cp->tor->info.pieceCount;
     tr_bitfieldConstruct( &pieces, n );
 

trunk/libtransmission/peer-msgs.c

@@ -1985 +1985 @@
 sendBitfield( tr_peermsgs * msgs )
 {
+    void * bytes;
     size_t byte_count = 0;
     struct evbuffer * out = msgs->outMessages;
-    void * bytes = tr_cpCreatePieceBitfield( &msgs->torrent->completion, &byte_count );
-
+
+    assert( tr_torrentHasMetadata( msgs->torrent ) );
+
+    bytes = tr_cpCreatePieceBitfield( &msgs->torrent->completion, &byte_count );
     evbuffer_add_uint32( out, sizeof( uint8_t ) + byte_count );
     evbuffer_add_uint8 ( out, BT_BITFIELD );

trunk/libtransmission/rpcimpl.c

@@ -653 +653 @@
         tr_bencDictAddInt( d, key, st->peersSendingToUs );
     else if( tr_streq( key, keylen, "pieces" ) ) {
-        size_t byte_count = 0;
-        void * bytes = tr_cpCreatePieceBitfield( &tor->completion, &byte_count );
-        char * str = tr_base64_encode( bytes, byte_count, NULL );
-        tr_bencDictAddStr( d, key, str!=NULL ? str : "" );
-        tr_free( str );
-        tr_free( bytes );
+        if (tr_torrentHasMetadata( tor ) ) {
+            size_t byte_count = 0;
+            void * bytes = tr_cpCreatePieceBitfield( &tor->completion, &byte_count );
+            char * str = tr_base64_encode( bytes, byte_count, NULL );
+            tr_bencDictAddStr( d, key, str!=NULL ? str : "" );
+            tr_free( str );
+            tr_free( bytes );
+        } else {
+            tr_bencDictAddStr( d, key, "" );
+        }
     }
     else if( tr_streq( key, keylen, "pieceCount" ) )