Add missing SetupGeneration error handling in EncryptWallet

ryanofsky · ryanofsky · commit 05b224a17506 · 2019-11-05T10:53:07.000-05:00
Suggested bitcoin/bitcoin#17304 (comment) by me
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -572,7 +572,9 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
         // if we are using HD, replace the HD seed with a new one
         if (auto spk_man = m_spk_man.get()) {
             if (spk_man->IsHDEnabled()) {
-                spk_man->SetupGeneration(true);
+                if (!spk_man->SetupGeneration(true)) {
+                    return false;
+                }
             }
         }
         Lock();

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,9 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)`
`572`	`572`	`// if we are using HD, replace the HD seed with a new one`
`573`	`573`	`if (auto spk_man = m_spk_man.get()) {`
`574`	`574`	`if (spk_man->IsHDEnabled()) {`
`575`		`- spk_man->SetupGeneration(true);`
	`575`	`+ if (!spk_man->SetupGeneration(true)) {`
	`576`	`+ return false;`
	`577`	`+ }`
`576`	`578`	`}`
`577`	`579`	`}`
`578`	`580`	`Lock();`