LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Ensure backupwallet fails when attempting to backup to source file

Browse source 
Previous behaviour was to destroy the wallet (to zero-length)
This commit is contained in:
Tomas van der Wansem 2017-09-21 00:10:46 +02:00
parent 5a9da37fb3
commit 5d465e3962
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/wallet/db.cpp
View file

@ -672,6 +672,11 @@ bool CWalletDBWrapper::Backup(const std::string& strDest)
pathDest /= strFile; pathDest /= strFile;
try { try {
if (fs::equivalent(pathSrc, pathDest)) {
LogPrintf("cannot backup to wallet source file %s\n", pathDest.string());
return false;
}
fs::copy_file(pathSrc, pathDest, fs::copy_option::overwrite_if_exists); fs::copy_file(pathSrc, pathDest, fs::copy_option::overwrite_if_exists);
LogPrintf("copied %s to %s\n", strFile, pathDest.string()); LogPrintf("copied %s to %s\n", strFile, pathDest.string());
return true; return true;

10
test/functional/walletbackup.py
View file

@ -190,6 +190,16 @@ class WalletBackupTest(BitcoinTestFramework):
assert_equal(self.nodes[1].getbalance(), balance1) assert_equal(self.nodes[1].getbalance(), balance1)
assert_equal(self.nodes[2].getbalance(), balance2) assert_equal(self.nodes[2].getbalance(), balance2)
# Backup to source wallet file must fail
sourcePaths = [
tmpdir + "/node0/regtest/wallet.dat",
tmpdir + "/node0/./regtest/wallet.dat",
tmpdir + "/node0/regtest/",
tmpdir + "/node0/regtest"]
for sourcePath in sourcePaths:
assert_raises_rpc_error(-4, "backup failed", self.nodes[0].backupwallet, sourcePath)
if __name__ == '__main__': if __name__ == '__main__':
WalletBackupTest().main() WalletBackupTest().main()