From a6da027d83e48f05c933149ff89c9b9ad5ced915 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jo=C3=A3o=20Barbosa?= <joao.paulo.barbosa@gmail.com>
Date: Thu, 27 Jul 2017 00:57:02 +0100
Subject: [PATCH] Reject invalid wallet files

---
 src/wallet/wallet.cpp          |  4 ++++
 test/functional/multiwallet.py | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ccf5353eb..ef1d76414 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 5844d9913..c60d345ac 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"
-- 
2.11.4.GIT