[wallet] Fix potential memory leak in CreateWalletFromFile

Fix proposed by ryanofsky in bitcoin#12647 (comment)
PastaPastaPasta · May 10, 2020 · 7649c32 · 7649c32
1 parent fcde41d
commit 7649c32
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -5160,7 +5160,6 @@ CWallet* CWallet::CreateWalletFromFile(const std::string& name, const fs::path&
     }
 
     walletInstance->m_last_block_processed = chainActive.Tip();
-    RegisterValidationInterface(walletInstance);
 
     if (chainActive.Tip() && chainActive.Tip() != pindexRescan)
     {
@@ -5226,6 +5225,10 @@ CWallet* CWallet::CreateWalletFromFile(const std::string& name, const fs::path&
             }
         }
     }
+
+    // Register with the validation interface. It's ok to do this after rescan since we're still holding cs_main.
+    RegisterValidationInterface(temp_wallet.release());
+
     walletInstance->SetBroadcastTransactions(gArgs.GetBoolArg("-walletbroadcast", DEFAULT_WALLETBROADCAST));
 
     {