Check m_internals in UnregisterValidationInterface

promag · promag · commit 0dd6a8c12489 · 2019-02-03T22:23:44.000Z
When a wallet is created it is registered in the validation interface (in
CWallet::CreateWalletFromFile) but it is not immediately added to the
wallets list. If a shutdown is requested before AddWallet (case more
evident when -rescan is set) then m_internals can be released (in
Shutdown -&gt; UnregisterBackgroundSignalScheduler) before the wallet and
then ReleaseWallet would call UnregisterValidationInterface with
m_internals already released.
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
@@ -107,7 +107,9 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn) {
 }
 
 void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
-    g_signals.m_internals->m_connMainSignals.erase(pwalletIn);
+    if (g_signals.m_internals) {
+        g_signals.m_internals->m_connMainSignals.erase(pwalletIn);
+    }
 }
 
 void UnregisterAllValidationInterfaces() {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,9 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn) {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`void UnregisterValidationInterface(CValidationInterface* pwalletIn) {`
`110`		`- g_signals.m_internals->m_connMainSignals.erase(pwalletIn);`
	`110`	`+ if (g_signals.m_internals) {`
	`111`	`+ g_signals.m_internals->m_connMainSignals.erase(pwalletIn);`
	`112`	`+ }`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`void UnregisterAllValidationInterfaces() {`