wallet: guard null m_last_block_processed

furszy · furszy · commit 296c95664e96 · 2021-02-21T10:49:50.000-03:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1323,7 +1323,7 @@ void CWallet::BlockUntilSyncedToCurrentChain() {
     AssertLockNotHeld(cs_main);
     AssertLockNotHeld(cs_wallet);
 
-    {
+    if (m_last_block_processed) {
         // Skip the queue-draining stuff if we know we're caught up with
         // chainActive.Tip()...
         // We could also take cs_wallet here, and call m_last_block_processed
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -529,7 +529,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      *
      * Protected by cs_main (see BlockUntilSyncedToCurrentChain)
      */
-    const CBlockIndex* m_last_block_processed;
+    const CBlockIndex* m_last_block_processed{nullptr};
 
     int64_t nNextResend;
     int64_t nLastResend;

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface`
`529`	`529`	`*`
`530`	`530`	`* Protected by cs_main (see BlockUntilSyncedToCurrentChain)`
`531`	`531`	`*/`
`532`		`- const CBlockIndex* m_last_block_processed;`
	`532`	`+ const CBlockIndex* m_last_block_processed{nullptr};`
`533`	`533`
`534`	`534`	`int64_t nNextResend;`
`535`	`535`	`int64_t nLastResend;`