From 99a209e3c964d5423320d58f3cc4b3d21886c278 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Wed, 2 Nov 2011 08:04:16 +0000 Subject: [PATCH] web_peer_connection fix and assert --- src/web_peer_connection.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/web_peer_connection.cpp b/src/web_peer_connection.cpp index f2f8f2cb5..23a1f3521 100644 --- a/src/web_peer_connection.cpp +++ b/src/web_peer_connection.cpp @@ -688,6 +688,7 @@ namespace libtorrent incoming_piece(front_request, &m_piece[0]); m_requests.pop_front(); if (associated_torrent().expired()) return; + TORRENT_ASSERT(m_block_pos >= front_request.length); m_block_pos -= front_request.length; cut_receive_buffer(m_body_start, t->block_size() + 1024); m_body_start = 0; @@ -701,7 +702,7 @@ namespace libtorrent // report all received blocks to the bittorrent engine while (!m_requests.empty() && 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(); TORRENT_ASSERT(recv_buffer.left() >= r.length);