From 66ee3764117e4d01c1ed3e0ff05ca60161ea9a69 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 21 Jun 2018 11:48:10 -0500 Subject: [PATCH] BIT-1938: fix crash in Broker manager shutdown --- src/broker/Manager.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index e78db804a8..20bba4426d 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -226,7 +226,9 @@ void Manager::Terminate() FlushLogBuffers(); for ( auto& p : bstate->endpoint.peers() ) - bstate->endpoint.unpeer(p.peer.network->address, p.peer.network->port); + if ( p.peer.network ) + bstate->endpoint.unpeer(p.peer.network->address, + p.peer.network->port); bstate->endpoint.shutdown(); }