Full checking of all loaded keys

2 files changed, 14 insertions, 1 deletions

diff --git a/src/db.cpp b/src/db.cpp
index bd31bd7943..600afe383d 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -879,7 +879,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
                     CPrivKey pkey;
                     ssValue >> pkey;
                     key.SetPrivKey(pkey);
-                    if (key.GetPubKey() != vchPubKey)
+                    if (key.GetPubKey() != vchPubKey || !key.IsValid())
                         return DB_CORRUPT;
                 }
                 else
@@ -887,6 +887,8 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
                     CWalletKey wkey;
                     ssValue >> wkey;
                     key.SetPrivKey(wkey.vchPrivKey);
+                    if (key.GetPubKey() != vchPubKey || !key.IsValid())
+                        return DB_CORRUPT;
                 }
                 if (!pwallet->LoadKey(key))
                     return DB_CORRUPT;
diff --git a/src/key.h b/src/key.h
index d2e6689456..0d0b6d8bb4 100644
--- a/src/key.h
+++ b/src/key.h
@@ -233,6 +233,17 @@ public:
     {
         return CBitcoinAddress(GetPubKey());
     }
+
+    bool IsValid()
+    {
+        if (!fSet)
+            return false;
+
+        CSecret secret = GetSecret();
+        CKey key2;
+        key2.SetSecret(secret);
+        return GetPubKey() == key2.GetPubKey();
+    }
 };
 
 #endif