From f14b7d5a1211fc9af30fb8b362f5cb932aba67a4 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Thu, 25 Mar 2021 16:12:24 +0100
Subject: [PATCH] check_password_for_directory: safeguards

---
 electrum/wallet.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/electrum/wallet.py b/electrum/wallet.py
index 51633bfc6..e4cc8d966 100644
--- a/electrum/wallet.py
+++ b/electrum/wallet.py
@@ -3218,8 +3218,13 @@ def check_password_for_directory(config: SimpleConfig, old_password, new_passwor
             is_unified = False
             # it is a bit wasteful load the wallet here, but that is fine
             # because we are progressively enforcing storage encryption.
-            db = WalletDB(storage.read(), manual_upgrades=False)
-            wallet = Wallet(db, storage, config=config)
+            try:
+                db = WalletDB(storage.read(), manual_upgrades=False)
+                wallet = Wallet(db, storage, config=config)
+            except:
+                _logger.exception(f'failed to load {basename}:')
+                failed.append(basename)
+                continue
             if wallet.has_keystore_encryption():
                 try:
                     wallet.check_password(old_password)
@@ -3240,8 +3245,13 @@ def check_password_for_directory(config: SimpleConfig, old_password, new_passwor
         except:
             failed.append(basename)
             continue
-        db = WalletDB(storage.read(), manual_upgrades=False)
-        wallet = Wallet(db, storage, config=config)
+        try:
+            db = WalletDB(storage.read(), manual_upgrades=False)
+            wallet = Wallet(db, storage, config=config)
+        except:
+            _logger.exception(f'failed to load {basename}:')
+            failed.append(basename)
+            continue
         try:
             wallet.check_password(old_password)
         except: