jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix another pad file corner case

Browse Source
This commit is contained in:
Arvid Norberg
2012-02-17 07:19:54 +00:00
parent 1244ae8894
commit d9db8e20f5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/torrent.cpp
View File

@@ -2813,14 +2813,20 @@ namespace libtorrent
{ {
if (!i->pad_file) continue; if (!i->pad_file) continue;
peer_request p = files.map_file(fileno, 0, i->size); peer_request p = files.map_file(fileno, 0, i->size);
for (int j = p.piece; p.length > 0; ++j, p.length -= piece_size) for (int j = p.piece; p.length > 0; ++j)
{ {
int deduction = (std::min)(p.length, piece_size); int deduction = (std::min)(p.length, piece_size - p.start);
bool done = m_picker->have_piece(j); bool done = m_picker->have_piece(j);
bool wanted = m_picker->piece_priority(j) > 0; bool wanted = m_picker->piece_priority(j) > 0;
if (done) st.total_done -= deduction; if (done) st.total_done -= deduction;
if (wanted) st.total_wanted -= deduction; if (wanted) st.total_wanted -= deduction;
if (wanted && done) st.total_wanted_done -= deduction; if (wanted && done) st.total_wanted_done -= deduction;
TORRENT_ASSERT(st.total_done >= 0);
TORRENT_ASSERT(st.total_wanted >= 0);
TORRENT_ASSERT(st.total_wanted_done >= 0);
p.length -= piece_size - p.start;
p.start = 0;
++p.piece;
} }
} }
} }