Permalink
Browse files

Merge #7904: txdb: Fix assert crash in new UTXO set cursor

a3310b4 txdb: Fix assert crash in new UTXO set cursor (Wladimir J. van der Laan)
  • Loading branch information...
laanwj committed Apr 19, 2016
2 parents d289950 + a3310b4 commit fc9e3346e6749585f701e9d1cb59e60f1d152d06
Showing with 1 addition and 5 deletions.
  1. +1 −5 src/txdb.cpp
View
@@ -134,12 +134,8 @@ bool CCoinsViewDBCursor::Valid() const
void CCoinsViewDBCursor::Next()
{
pcursor->Next();
if (pcursor->Valid()) {
bool ok = pcursor->GetKey(keyTmp);
assert(ok); // If GetKey fails here something must be wrong with underlying database, we cannot handle that here
} else {
if (!pcursor->Valid() || !pcursor->GetKey(keyTmp))
keyTmp.first = 0; // Invalidate cached key after last record so that Valid() and GetKey() return false
}
}
bool CBlockTreeDB::WriteBatchSync(const std::vector<std::pair<int, const CBlockFileInfo*> >& fileInfo, int nLastFile, const std::vector<const CBlockIndex*>& blockinfo) {

0 comments on commit fc9e334

Please sign in to comment.