wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fix NAT-PMP crash when removing a mapping at the wrong time

This commit is contained in:
arvidn 2017-05-20 07:06:11 -04:00 committed by Arvid Norberg
parent 56d5d795bf
commit 83735fdbb4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,3 +1,4 @@
* fix NAT-PMP crash when removing a mapping at the wrong time
* improve path sanitization (filter unicode text direction characters) * improve path sanitization (filter unicode text direction characters)
* deprecate partial_piece_info::piece_state * deprecate partial_piece_info::piece_state
* bind upnp requests to correct local address * bind upnp requests to correct local address

3
src/natpmp.cpp
View File

@ -279,7 +279,8 @@ void natpmp::try_next_mapping(int i, mutex::scoped_lock& l)
std::vector<mapping_t>::iterator m = std::find_if( std::vector<mapping_t>::iterator m = std::find_if(
m_mappings.begin(), m_mappings.end() m_mappings.begin(), m_mappings.end()
, boost::bind(&mapping_t::action, _1) != int(mapping_t::action_none)); , boost::bind(&mapping_t::action, _1) != int(mapping_t::action_none)
&& boost::bind(&mapping_t::protocol, _1) != int(none));
if (m == m_mappings.end()) if (m == m_mappings.end())
{ {