net: stop both net/net_processing before destroying them

This should avoid either attempting to use an invalid reference/pointer to the other. Github-Pull: bitcoin#10756 Rebased-From: 2525b97
maflcko · Nov 2, 2017 · 0a5477c · 0a5477c
1 parent b4136f2
commit 0a5477c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/init.cpp b/src/init.cpp
@@ -193,9 +193,13 @@ void Shutdown()
     }
 #endif
     MapPort(false);
+
+    // Because these depend on each-other, we make sure that neither can be
+    // using the other before destroying them.
     UnregisterValidationInterface(peerLogic.get());
-    g_connman.reset();
+    g_connman->Stop();
     peerLogic.reset();
+    g_connman.reset();
 
     StopTorControl();
     if (fDumpMempoolLater && gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {