LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Prevent crashes due to missing or corrupted database records

Browse source 
Any problems seen during deserialization will throw an uncaught
exception, crashing the entire bitcoin process.  Properly return an
error instead, so that we may at least log the error and gracefully
shutdown other portions of the app.
This commit is contained in:
Jeff Garzik 2012-05-22 15:12:52 -04:00 committed by Jeff Garzik
parent d1edab602a
commit f94b64c2f3
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/db.cpp
View file

@ -416,9 +416,15 @@ bool CTxDB::ReadOwnerTxes(uint160 hash160, int nMinHeight, vector<CTransaction>&
string strType; string strType;
uint160 hashItem; uint160 hashItem;
CDiskTxPos pos; CDiskTxPos pos;
ssKey >> strType >> hashItem >> pos;
int nItemHeight; int nItemHeight;
ssValue >> nItemHeight;
try {
ssKey >> strType >> hashItem >> pos;
ssValue >> nItemHeight;
}
catch (std::exception &e) {
return error("%s() : deserialize error", __PRETTY_FUNCTION__);
}
// Read transaction // Read transaction
if (strType != "owner" || hashItem != hash160) if (strType != "owner" || hashItem != hash160)
@ -533,6 +539,8 @@ bool CTxDB::LoadBlockIndex()
return false; return false;
// Unserialize // Unserialize
try {
string strType; string strType;
ssKey >> strType; ssKey >> strType;
if (strType == "blockindex" && !fRequestShutdown) if (strType == "blockindex" && !fRequestShutdown)
@ -564,6 +572,10 @@ bool CTxDB::LoadBlockIndex()
{ {
break; // if shutdown requested or finished loading block index break; // if shutdown requested or finished loading block index
} }
} // try
catch (std::exception &e) {
return error("%s() : deserialize error", __PRETTY_FUNCTION__);
}
} }
pcursor->close(); pcursor->close();

9
src/db.h
View file

@ -72,8 +72,13 @@ protected:
return false; return false;
// Unserialize value // Unserialize value
CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK, CLIENT_VERSION); try {
ssValue >> value; CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK, CLIENT_VERSION);
ssValue >> value;
}
catch (std::exception &e) {
return false;
}
// Clear and free memory // Clear and free memory
memset(datValue.get_data(), 0, datValue.get_size()); memset(datValue.get_data(), 0, datValue.get_size());