From bf08de36d9a3783c01aba75a08dff9586def0ab9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 15 Jan 2010 00:20:48 +0000 Subject: [PATCH] (trunk libT) remove the r9933 assertions and maybe fix Yada's bug --- libtransmission/bitset.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libtransmission/bitset.h b/libtransmission/bitset.h index b8cad6345..44686c5bc 100644 --- a/libtransmission/bitset.h +++ b/libtransmission/bitset.h @@ -53,11 +53,8 @@ tr_bitsetReserve( tr_bitset * b, size_t size ) tr_bitfieldDestruct( &b->bitfield ); tr_bitfieldConstruct( &b->bitfield, size ); - assert( b != NULL ); - assert( b->bitfield.bits != NULL ); - assert( tmp->bits != NULL ); - - memcpy( b->bitfield.bits, tmp->bits, tmp->byteCount ); + if( ( tmp->bits != NULL ) && ( tmp->byteCount > 0 ) ) + memcpy( b->bitfield.bits, tmp->bits, tmp->byteCount ); tr_bitfieldFree( tmp ); }