diff options
| author | Gavin Andresen <[email protected]> | 2012-01-31 12:19:26 -0500 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-01-31 12:19:26 -0500 |
| commit | 4477b17f15ac3e574fdddef7c9cf10473158d30d (patch) | |
| tree | 94a1acddc9c40fe04539e318172920281ecebf96 /src/db.cpp | |
| parent | CreateNewBlock was not adding in transaction fees. (diff) | |
| parent | Full checking of all loaded keys (diff) | |
| download | discoin-4477b17f15ac3e574fdddef7c9cf10473158d30d.tar.xz discoin-4477b17f15ac3e574fdddef7c9cf10473158d30d.zip | |
Merge branch 'checkkeys' of https://github.com/sipa/bitcoin
Diffstat (limited to 'src/db.cpp')
| -rw-r--r-- | src/db.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/db.cpp b/src/db.cpp index 9ad05ba78..07f58ef38 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -862,7 +862,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet) ssValue >> pkey; key.SetPubKey(vchPubKey); key.SetPrivKey(pkey); - if (key.GetPubKey() != vchPubKey) + if (key.GetPubKey() != vchPubKey || !key.IsValid()) return DB_CORRUPT; } else @@ -871,6 +871,8 @@ int CWalletDB::LoadWallet(CWallet* pwallet) ssValue >> wkey; key.SetPubKey(vchPubKey); key.SetPrivKey(wkey.vchPrivKey); + if (key.GetPubKey() != vchPubKey || !key.IsValid()) + return DB_CORRUPT; } if (!pwallet->LoadKey(key)) return DB_CORRUPT; |