mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Jordan Lee 2012-09-19 05:11:19 +00:00
parent 8096c12fe0
commit 624c8ff1cc
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libtransmission/completion.c
View File

@ -271,8 +271,12 @@ void *
tr_cpCreatePieceBitfield( const tr_completion * cp, size_t * byte_count )
{
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 );
if( tr_cpHasAll( cp ) )

5
libtransmission/peer-msgs.c
View File

@ -1984,10 +1984,13 @@ gotError( tr_peerIo * io UNUSED, short what, void * vmsgs )
static void
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 );
evbuffer_add ( out, bytes, byte_count );

16
libtransmission/rpcimpl.c
View File

@ -652,12 +652,16 @@ addField( const tr_torrent * const tor,
else if( tr_streq( key, keylen, "peersSendingToUs" ) )
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" ) )
tr_bencDictAddInt( d, key, inf->pieceCount );