Merge pull request #4080

dead780f abstract_tcp_server2: fix use after free (moneromooo-monero)
6 years ago · c58758a016
parent d1f102626c dead780f8a
commit c58758a016
1 changed files with 2 additions and 2 deletions
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@ -653,13 +653,13 @@ PRAGMA_WARNING_DISABLE_VS(4355)
    m_timer.cancel();
    boost::system::error_code ignored_ec;
    socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored_ec);
-    m_was_shutdown = true;
-    m_protocol_handler.release_protocol();
    if (!m_host.empty())
    {
      try { host_count(m_host, -1); } catch (...) { /* ignore */ }
      m_host = "";
    }
+    m_was_shutdown = true;
+    m_protocol_handler.release_protocol();
    return true;
  }
  //---------------------------------------------------------------------------------