wallet: Log and ignore errors in ListWalletDir and IsBerkeleyBtree

1 files changed, 11 insertions, 2 deletions

diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp
index d779251d56..2d8adf8ba6 100644
--- a/src/wallet/walletutil.cpp
+++ b/src/wallet/walletutil.cpp
@@ -4,6 +4,7 @@
 
 #include <wallet/walletutil.h>
 
+#include <logging.h>
 #include <util/system.h>
 
 fs::path GetWalletDir()
@@ -33,7 +34,9 @@ static bool IsBerkeleyBtree(const fs::path& path)
     // A Berkeley DB Btree file has at least 4K.
     // This check also prevents opening lock files.
     boost::system::error_code ec;
-    if (fs::file_size(path, ec) < 4096) return false;
+    auto size = fs::file_size(path, ec);
+    if (ec) LogPrintf("%s: %s %s\n", __func__, ec.message(), path.string());
+    if (size < 4096) return false;
 
     fsbridge::ifstream file(path, std::ios::binary);
     if (!file.is_open()) return false;
@@ -54,8 +57,14 @@ std::vector<fs::path> ListWalletDir()
     const fs::path wallet_dir = GetWalletDir();
     const size_t offset = wallet_dir.string().size() + 1;
     std::vector<fs::path> paths;
+    boost::system::error_code ec;
+
+    for (auto it = fs::recursive_directory_iterator(wallet_dir, ec); it != fs::recursive_directory_iterator(); it.increment(ec)) {
+        if (ec) {
+            LogPrintf("%s: %s %s\n", __func__, ec.message(), it->path().string());
+            continue;
+        }
 
-    for (auto it = fs::recursive_directory_iterator(wallet_dir); it != fs::recursive_directory_iterator(); ++it) {
         // Get wallet path relative to walletdir by removing walletdir from the wallet path.
         // This can be replaced by boost::filesystem::lexically_relative once boost is bumped to 1.60.
         const fs::path path = it->path().string().substr(offset);