diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-02 20:17:41 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-02 20:17:41 -0500 |
| commit | 882e00e2159ce5e12170c7c1811236a039d8abfa (patch) | |
| tree | 03e522bdc55f5a11e43c3c2cb2891895ecb704a9 /src/db.cpp | |
| parent | c13d50d8617678c8696b1f33549ed9cc3a0b554e (diff) | |
| parent | c11e2b8679e13f739a58faf2a3439d4aaed24364 (diff) | |
| download | bitcoin-882e00e2159ce5e12170c7c1811236a039d8abfa.tar.xz | |
Merge branch '0.4.x' into 0.5.0.x
Conflicts:
src/main.cpp
Diffstat (limited to 'src/db.cpp')
| -rw-r--r-- | src/db.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/db.cpp b/src/db.cpp index 9ac93b3506..c2d18279da 100644 --- 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; |