From e4bb337b49864b58ad7ddd8743fa748ad157166a Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Wed, 14 Nov 2012 04:53:29 +0000 Subject: [PATCH] merged utp fix from RC_0_16 --- ChangeLog | 1 + src/packet_buffer.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index da1a47c08..4b9d80d6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * fix uTP edge case where udp socket buffer fills up * fix nagle implementation in uTP + * fixed bug in uTP packet circle buffer * fix potential crash when using torrent_handle::add_piece * added missing add_torrent_alert to python binding diff --git a/src/packet_buffer.cpp b/src/packet_buffer.cpp index d47d6bbc9..68e2d2d8d 100644 --- a/src/packet_buffer.cpp +++ b/src/packet_buffer.cpp @@ -104,7 +104,7 @@ namespace libtorrent { else if (idx < m_first) { // We have wrapped. - if (idx > ((m_first + m_capacity) & 0xffff) && m_capacity < 0xffff) + if (idx >= ((m_first + m_capacity) & 0xffff) && m_capacity < 0xffff) { reserve(m_capacity + (idx - ((m_first + m_capacity) & 0xffff))); }