Skip to content

Commit

Permalink
Merge bitcoin#11326: Fix crash on shutdown with invalid wallet
Browse files Browse the repository at this point in the history
77939f2 Fix uninitialized g_connman crash in Shutdown() (MeshCollider)

Pull request description:

  Fixes bitcoin#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
  • Loading branch information
MarcoFalke committed Sep 14, 2017
2 parents 96d91b7 + 77939f2 commit 0f399a9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ void Shutdown()
// Because these depend on each-other, we make sure that neither can be
// using the other before destroying them.
UnregisterValidationInterface(peerLogic.get());
g_connman->Stop();
if(g_connman) g_connman->Stop();
peerLogic.reset();
g_connman.reset();

Expand Down

0 comments on commit 0f399a9

Please sign in to comment.