maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added explicit check for key length when loading blocks from disk, to catch 1.7/1.8 change. This

Browse source 
avoids the problem where mis-loaded blocks later cause an assertion error.
This commit is contained in:
Ross Nicoll 2014-08-09 15:36:48 +01:00
parent a7dbc0038d
commit c948d4d85b
No known key found for this signature in database
GPG key ID: 9142E5F7E533CE3B
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/txdb.cpp
View file

@ -198,7 +198,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
CDataStream ssKeySet(SER_DISK, CLIENT_VERSION);
uint256 hash;
ssKeySet << boost::tuples::make_tuple('b', uint256(0), 'a'); // 'b' is the prefix for BlockIndex, 'a' sigifies the first part
ssKeySet << boost::tuples::make_tuple('b', uint256(0), 'a'); // 'b' is the prefix for BlockIndex, 'a' signifies the first part
pcursor->Seek(ssKeySet.str());
// Load mapBlockIndex
@ -210,6 +210,11 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
char chType;
ssKey >> chType;
if (chType == 'b') {
// Detect pre-1.8 keys in the database and abort if found
if (slKey.size() < ssKeySet.size()) {
return error("Database key size is %d expected %d, require reindex to upgrade.", slKey.size(), ssKeySet.size());
}
ssKey >> hash;
leveldb::Slice slValue = pcursor->value();