Merge #11326: Fix crash on shutdown with invalid wallet

77939f27f Fix uninitialized g_connman crash in Shutdown() (MeshCollider)

Pull request description:

  Fixes https://github.com/bitcoin/bitcoin/issues/11312

  As @dooglus pointed out, `g_connman` is uninitialized when an invalid wallet path is passed on start up, but then dereferenced in `Shutdown()`, so this tiny PR just fixes that.

Tree-SHA512: 2557133422a6e393017081450a7e6c100fe7d9ce36e628e5f5f479bc07617a7bd9a9ad4d44c0d8abadf2e3eb62a11ce9743abc27b4ae8c20f709e72df4f25a7f
This commit is contained in:
MarcoFalke 2017-09-14 16:45:09 +02:00
commit 0f399a9ff2
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25

View File

@ -194,7 +194,7 @@ void Shutdown()
// Because these depend on each-other, we make sure that neither can be // Because these depend on each-other, we make sure that neither can be
// using the other before destroying them. // using the other before destroying them.
UnregisterValidationInterface(peerLogic.get()); UnregisterValidationInterface(peerLogic.get());
g_connman->Stop(); if(g_connman) g_connman->Stop();
peerLogic.reset(); peerLogic.reset();
g_connman.reset(); g_connman.reset();