diff options
| author | Gavin Andresen <[email protected]> | 2013-01-29 19:37:44 -0800 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-01-29 19:37:44 -0800 |
| commit | db3b4ade7ba8a91afaa649177d5f297f20eb40fd (patch) | |
| tree | 9a03e88480630844c8732379b2b7286313b1b901 /src/walletdb.cpp | |
| parent | Merge branch 'master' of github.com:bitcoin/bitcoin (diff) | |
| parent | Deal with LevelDB errors (diff) | |
| download | discoin-db3b4ade7ba8a91afaa649177d5f297f20eb40fd.tar.xz discoin-db3b4ade7ba8a91afaa649177d5f297f20eb40fd.zip | |
Merge pull request #2224 from sipa/valstate
Improve error handling during validation
Diffstat (limited to 'src/walletdb.cpp')
| -rw-r--r-- | src/walletdb.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 2282bed18..fe9bce21e 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -203,7 +203,8 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, ssKey >> hash; CWalletTx& wtx = pwallet->mapWallet[hash]; ssValue >> wtx; - if (wtx.CheckTransaction() && (wtx.GetHash() == hash)) + CValidationState state; + if (wtx.CheckTransaction(state) && (wtx.GetHash() == hash) && state.IsValid()) wtx.BindWallet(pwallet); else { |