diff options
| author | Cory Fields <[email protected]> | 2016-09-13 14:42:55 -0400 |
|---|---|---|
| committer | Cory Fields <[email protected]> | 2016-09-13 22:43:23 -0400 |
| commit | 36fa01f217fbc32afb90314fd257650c71a47045 (patch) | |
| tree | 30e238e40abdffd1f476de554e13cf824a5bd638 /src | |
| parent | Merge #8693: add witness address to address book (diff) | |
| download | discoin-36fa01f217fbc32afb90314fd257650c71a47045.tar.xz discoin-36fa01f217fbc32afb90314fd257650c71a47045.zip | |
net: only delete CConnman if it's been created
In the case of (for example) an already-running bitcoind, the shutdown sequence
begins before CConnman has been created, leading to a null-pointer dereference
when g_connman->Stop() is called.
Instead, Just let the CConnman dtor take care of stopping.
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 1 | ||||
| -rw-r--r-- | src/net.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index e9552da67..8d1e330a0 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -200,7 +200,6 @@ void Shutdown() pwalletMain->Flush(false); #endif MapPort(false); - g_connman->Stop(); g_connman.reset(); StopTorControl(); diff --git a/src/net.cpp b/src/net.cpp index b39ef9f54..30513a3b9 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2205,6 +2205,7 @@ void CConnman::DeleteNode(CNode* pnode) CConnman::~CConnman() { + Stop(); } size_t CConnman::GetAddressCount() const |