aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/wallet/wallet.cpp4
-rwxr-xr-xtest/functional/multiwallet.py10
2 files changed, 14 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ccf5353eb7..ef1d764146 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -482,6 +482,10 @@ bool CWallet::Verify()
fs::path wallet_path = fs::absolute(walletFile, GetDataDir());
+ if (fs::exists(wallet_path) && (!fs::is_regular_file(wallet_path) || fs::is_symlink(wallet_path))) {
+ return InitError(_("Invalid -wallet file"));
+ }
+
if (!wallet_paths.insert(wallet_path).second) {
return InitError(_("Duplicate -wallet filename"));
}
diff --git a/test/functional/multiwallet.py b/test/functional/multiwallet.py
index 5844d99139..c60d345acb 100755
--- a/test/functional/multiwallet.py
+++ b/test/functional/multiwallet.py
@@ -6,6 +6,8 @@
Verify that a bitcoind node can load multiple wallet files
"""
+import os
+
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_equal, assert_raises_jsonrpc
@@ -23,6 +25,14 @@ class MultiWalletTest(BitcoinTestFramework):
# should not initialize if there are duplicate wallets
self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w1', '-wallet=w1'], 'Duplicate -wallet filename')
+ # should not initialize if wallet file is a directory
+ os.mkdir(os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w11'))
+ self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w11'], 'Invalid -wallet file')
+
+ # should not initialize if wallet file is a symlink
+ os.symlink(os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w1'), os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w12'))
+ self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w12'], 'Invalid -wallet file')
+
self.nodes[0] = self.start_node(0, self.options.tmpdir, self.extra_args[0])
w1 = self.nodes[0] / "wallet/w1"