aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-12-04 17:33:52 +0200
committerRiccardo Spagni <ric@spagni.net>2018-12-04 17:33:53 +0200
commit5ed45acaeccaf861b3833a422c8d6fb889915412 (patch)
treeccbb558bd15b412e8badbd1d09ab3ac23a58b53f
parentMerge pull request #4895 (diff)
parentprotocol: fix use after free when dropping a connection (diff)
downloadmonero-5ed45acaeccaf861b3833a422c8d6fb889915412.tar.xz
Merge pull request #4906
506472e0 protocol: fix use after free when dropping a connection (moneromooo-monero)
-rw-r--r--src/cryptonote_protocol/cryptonote_protocol_handler.inl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index 6081ddd89..5ba637c2f 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -1740,9 +1740,9 @@ skip:
if (add_fail)
m_p2p->add_host_fail(context.m_remote_address);
- m_p2p->drop_connection(context);
-
m_block_queue.flush_spans(context.m_connection_id, flush_all_spans);
+
+ m_p2p->drop_connection(context);
}
//------------------------------------------------------------------------------------------------------------------------
template<class t_core>