premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

web_peer_connection fix and assert

This commit is contained in:
Arvid Norberg 2011-11-02 08:04:16 +00:00
parent daedc43d3c
commit 99a209e3c9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/web_peer_connection.cpp
View File

@ -688,6 +688,7 @@ namespace libtorrent
incoming_piece(front_request, &m_piece[0]); incoming_piece(front_request, &m_piece[0]);
m_requests.pop_front(); m_requests.pop_front();
if (associated_torrent().expired()) return; if (associated_torrent().expired()) return;
TORRENT_ASSERT(m_block_pos >= front_request.length);
m_block_pos -= front_request.length; m_block_pos -= front_request.length;
cut_receive_buffer(m_body_start, t->block_size() + 1024); cut_receive_buffer(m_body_start, t->block_size() + 1024);
m_body_start = 0; m_body_start = 0;
@ -701,7 +702,7 @@ namespace libtorrent
// report all received blocks to the bittorrent engine // report all received blocks to the bittorrent engine
while (!m_requests.empty() while (!m_requests.empty()
&& range_contains(in_range, m_requests.front(), info.piece_length()) && range_contains(in_range, m_requests.front(), info.piece_length())
&& recv_buffer.left() >= m_requests.front().length) && m_block_pos >= m_requests.front().length)
{ {
peer_request r = m_requests.front(); peer_request r = m_requests.front();
TORRENT_ASSERT(recv_buffer.left() >= r.length); TORRENT_ASSERT(recv_buffer.left() >= r.length);