From a1e3670b33c2671f5b6f233c8373fc529ffb96f2 Mon Sep 17 00:00:00 2001
From: Riccardo Spagni <ric@spagni.net>
Date: Mon, 4 Dec 2017 11:07:32 +0200
Subject: [PATCH] catch wallet decrypt false positive

---
 src/wallet/wallet2.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 181bb1852..3333ee2d4 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -2289,7 +2289,7 @@ bool wallet2::load_keys(const std::string& keys_file_name, const std::string& pa
     m_confirm_backlog = true;
     m_confirm_backlog_threshold = 0;
   }
-  else
+  else if(json.IsObject())
   {
     if (!json.HasMember("key_data"))
     {
@@ -2368,6 +2368,11 @@ bool wallet2::load_keys(const std::string& keys_file_name, const std::string& pa
     // Wallet is being opened without testnet flag but is saved as a testnet wallet.
     THROW_WALLET_EXCEPTION_IF(!m_testnet && field_testnet, error::wallet_internal_error, "Testnet wallet can not be opened as mainnet wallet");
   }
+  else
+  {
+      THROW_WALLET_EXCEPTION(error::wallet_internal_error, "invalid password");
+      return false;
+  }
 
   const cryptonote::account_keys& keys = m_account.get_keys();
   r = epee::serialization::load_t_from_binary(m_account, account_data);