Merge branch '0.4.x' into 0.5.0.x

[novacoin.git] / src / db.cpp

diff --git a/src/db.cpp b/src/db.cpp
index 9ac93b3..c2d1827 100644 (file)
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -861,12 +861,16 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
                     CPrivKey pkey;
                     ssValue >> pkey;
                     key.SetPrivKey(pkey);
+                    if (key.GetPubKey() != vchPubKey || !key.IsValid())
+                        return DB_CORRUPT;
                 }
                 else
                 {
                     CWalletKey wkey;
                     ssValue >> wkey;
                     key.SetPrivKey(wkey.vchPrivKey);
+                    if (key.GetPubKey() != vchPubKey || !key.IsValid())
+                        return DB_CORRUPT;
                 }
                 if (!pwallet->LoadKey(key))
                     return DB_CORRUPT;