aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas van der Wansem <tomas@tomasvdw.nl>2017-09-21 00:10:46 +0200
committerTomas van der Wansem <tomas@tomasvdw.nl>2017-10-10 14:49:47 +0200
commit5d465e396249a0e2cc60b16984a2bdbe4c8993c3 (patch)
treea30633f6035bf19b5d1ceca21f014a2868c45188
parent5a9da37fb3f4b53f556e1d46509b94dc3c661d75 (diff)
Ensure backupwallet fails when attempting to backup to source file
Previous behaviour was to destroy the wallet (to zero-length)
-rw-r--r--src/wallet/db.cpp5
-rwxr-xr-xtest/functional/walletbackup.py10
2 files changed, 15 insertions, 0 deletions
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index d66ba48421..d49cd82340 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -672,6 +672,11 @@ bool CWalletDBWrapper::Backup(const std::string& strDest)
pathDest /= strFile;
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);
LogPrintf("copied %s to %s\n", strFile, pathDest.string());
return true;
diff --git a/test/functional/walletbackup.py b/test/functional/walletbackup.py
index 15ea26afa1..85a149793e 100755
--- a/test/functional/walletbackup.py
+++ b/test/functional/walletbackup.py
@@ -190,6 +190,16 @@ class WalletBackupTest(BitcoinTestFramework):
assert_equal(self.nodes[1].getbalance(), balance1)
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__':
WalletBackupTest().main()