mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-23 06:30:38 +00:00
Code Issues Releases Wiki Activity

in peer-mgr.c's tr_peerMgrGetDesiredAvailable(), confirm we have a swarm pointer before using it. Probable fix for bug #5407

Browse source
This commit is contained in:
Jordan Lee 2013-07-08 17:46:12 +00:00
parent 74d0f305a6
commit 0c507637db
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libtransmission/peer-mgr.c
View file

@ -2610,16 +2610,22 @@ tr_peerMgrGetDesiredAvailable (const tr_torrent * tor)
size_t i; size_t i;
size_t n; size_t n;
uint64_t desiredAvailable; uint64_t desiredAvailable;
const tr_swarm * s = tor->swarm; const tr_swarm * s;
assert (tr_isTorrent (tor));
/* common shortcuts... */ /* common shortcuts... */
if (tr_torrentIsSeed (s->tor)) if (tr_torrentIsSeed (tor))
return 0; return 0;
if (!tr_torrentHasMetadata (tor)) if (!tr_torrentHasMetadata (tor))
return 0; return 0;
s = tor->swarm;
if (s == NULL)
return 0;
n = tr_ptrArraySize (&s->peers); n = tr_ptrArraySize (&s->peers);
if (n == 0) if (n == 0)
{ {
@ -2641,7 +2647,7 @@ tr_peerMgrGetDesiredAvailable (const tr_torrent * tor)
desiredAvailable = 0; desiredAvailable = 0;
for (i=0, n=MIN (tor->info.pieceCount, s->pieceReplicationSize); i<n; ++i) for (i=0, n=MIN (tor->info.pieceCount, s->pieceReplicationSize); i<n; ++i)
if (!tor->info.pieces[i].dnd && (s->pieceReplication[i] > 0)) if (!tor->info.pieces[i].dnd && (s->pieceReplication[i] > 0))
desiredAvailable += tr_cpMissingBytesInPiece (&s->tor->completion, i); desiredAvailable += tr_cpMissingBytesInPiece (&tor->completion, i);
assert (desiredAvailable <= tor->info.totalSize); assert (desiredAvailable <= tor->info.totalSize);
return desiredAvailable; return desiredAvailable;
@ -3377,7 +3383,7 @@ struct peer_liveliness
void * clientData; void * clientData;
time_t pieceDataTime; time_t pieceDataTime;
time_t time; time_t time;
int speed; unsigned int speed;
bool doPurge; bool doPurge;
}; };