highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-02 11:41:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet: Set encrypted_batch to nullptr after delete. Avoid double free in the case of NDEBUG.

Browse Source
This commit is contained in:
practicalswift
2018-09-03 15:41:02 +02:00
parent 68f3c7eb08
commit fa462b3657
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/wallet.cpp
View File

@ -687,6 +687,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
{ {
encrypted_batch->TxnAbort(); encrypted_batch->TxnAbort();
delete encrypted_batch; delete encrypted_batch;
encrypted_batch = nullptr;
// We now probably have half of our keys encrypted in memory, and half not... // We now probably have half of our keys encrypted in memory, and half not...
// die and let the user reload the unencrypted wallet. // die and let the user reload the unencrypted wallet.
assert(false); assert(false);
@ -697,6 +698,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
if (!encrypted_batch->TxnCommit()) { if (!encrypted_batch->TxnCommit()) {
delete encrypted_batch; delete encrypted_batch;
encrypted_batch = nullptr;
// We now have keys encrypted in memory, but not on disk... // We now have keys encrypted in memory, but not on disk...
// die to avoid confusion and let the user reload the unencrypted wallet. // die to avoid confusion and let the user reload the unencrypted wallet.
assert(false); assert(false);