highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-18 21:33:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only remove database log files on shutdown after wallet encryption/rewrite

Browse Source
This commit is contained in:
Gavin Andresen
2011-11-17 14:21:32 -05:00
committed by Luke Dashjr
parent 90de05e88e
commit c4a3bf9e55
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/wallet.cpp
View File

@@ -194,8 +194,8 @@ bool CWallet::EncryptWallet(const string& strWalletPassphrase)
// Need to completely rewrite the wallet file; if we don't, bdb might keep
// bits of the unencrypted private key in slack space in the database file.
setKeyPool.clear();
CDB::Rewrite(strWalletFile);
if (CDB::Rewrite(strWalletFile))
RemoveLogFilesOnShutdown(true);
}
return true;
@@ -1134,6 +1134,7 @@ int CWallet::LoadWallet(bool& fFirstRunRet)
{
if (CDB::Rewrite(strWalletFile, "\x04pool"))
{
RemoveLogFilesOnShutdown(true);
setKeyPool.clear();
// Note: can't top-up keypool here, because wallet is locked.
// User will be prompted to unlock wallet the next operation