Skip to content

Commit 16fff80

Browse files
committed
Merge #11783: Fix shutdown in case of errors during initialization
d31e5c1 Fix shutdown in case of errors during initialization (Wladimir J. van der Laan) Pull request description: PR #10286 introduced a few steps which are not robust to early shutdown in initialization. Stumbled upon this with #11781, not sure if there are other scenarios that can trigger it, but it's good to harden against this in any case. E.g. ``` $ src/bitcoind -debuglogfile=/dfdf Error: Could not open debug log file /dfdf Program received signal SIGSEGV, Segmentation fault. UnregisterValidationInterface (pwalletIn=0x0) at /.../bitcoin/src/validationinterface.cpp:82 82 g_signals.m_internals->BlockChecked.disconnect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2)); (gdb) bt #0 UnregisterValidationInterface (pwalletIn=0x0) at /.../bitcoin/src/validationinterface.cpp:82 #1 0x00005555555a11fc in Shutdown () at /.../bitcoin/src/init.cpp:196 bitcoin-core#2 0x00005555555961cc in AppInit (argc=<optimized out>, argv=<optimized out>) at /.../bitcoin/src/bitcoind.cpp:183 bitcoin-core#3 0x0000555555596249 in main (argc=0, argv=0x555555ecf200) at /.../bitcoin/src/bitcoind.cpp:19 ``` Tree-SHA512: 7dd9570a9803514a17781bfadf1edde47e96df4e852cce2f423cab422e005fb94d44e777af1a6ea5167b04a4d889e848ae7a61a7e0e94232247ddea32ee70fc8
2 parents 8879d50 + d31e5c1 commit 16fff80

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/init.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ void Shutdown()
193193

194194
// Because these depend on each-other, we make sure that neither can be
195195
// using the other before destroying them.
196-
UnregisterValidationInterface(peerLogic.get());
197-
if(g_connman) g_connman->Stop();
196+
if (peerLogic) UnregisterValidationInterface(peerLogic.get());
197+
if (g_connman) g_connman->Stop();
198198
peerLogic.reset();
199199
g_connman.reset();
200200

src/validationinterface.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ void CMainSignals::UnregisterBackgroundSignalScheduler() {
4949
}
5050

5151
void CMainSignals::FlushBackgroundCallbacks() {
52-
m_internals->m_schedulerClient.EmptyQueue();
52+
if (m_internals) {
53+
m_internals->m_schedulerClient.EmptyQueue();
54+
}
5355
}
5456

5557
void CMainSignals::RegisterWithMempoolSignals(CTxMemPool& pool) {
@@ -92,6 +94,9 @@ void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
9294
}
9395

9496
void UnregisterAllValidationInterfaces() {
97+
if (!g_signals.m_internals) {
98+
return;
99+
}
95100
g_signals.m_internals->BlockChecked.disconnect_all_slots();
96101
g_signals.m_internals->Broadcast.disconnect_all_slots();
97102
g_signals.m_internals->Inventory.disconnect_all_slots();

0 commit comments

Comments
 (0)