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

(trunk libT) #2581 "RPC extended to manage tracker lists" -- add safeguards in tr_torrentSetAnnounceList() to handle the case of tracker arrays not being sorted by tier.

This commit is contained in:
Charles Kerr 2010-06-23 16:06:15 +00:00
parent 4d486fc2c2
commit 5e2a6f6c6a
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libtransmission/torrent.c
View File

@ -2145,18 +2145,38 @@ tr_torrentGetMTimes( const tr_torrent * tor, size_t * setme_n )
****
***/
static int
compareTrackerByTier( const void * va, const void * vb )
{
const tr_tracker_info * a = va;
const tr_tracker_info * b = vb;
/* sort by tier */
if( a->tier != b->tier )
return a->tier - b->tier;
/* get the effects of a stable sort by comparing the two elements' addresses */
return a - b;
}
tr_bool
tr_torrentSetAnnounceList( tr_torrent * tor,
const tr_tracker_info * trackers,
const tr_tracker_info * trackers_in,
int trackerCount )
{
int i;
tr_benc metainfo;
tr_bool ok = TRUE;
tr_tracker_info * trackers;
tr_torrentLock( tor );
assert( tr_isTorrent( tor ) );
/* ensure the trackers' tiers are in ascending order */
trackers = tr_memdup( trackers_in, sizeof( tr_tracker_info ) * trackerCount );
qsort( trackers, trackerCount, sizeof( tr_tracker_info ), compareTrackerByTier );
/* look for bad URLs */
for( i=0; ok && i<trackerCount; ++i )
if( !tr_urlIsValidTracker( trackers[i].announce ) )
@ -2236,6 +2256,8 @@ tr_torrentSetAnnounceList( tr_torrent * tor,
}
tr_torrentUnlock( tor );
tr_free( trackers );
return ok;
}