colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/brc0x0/tripwire-open-source

This commit is contained in:
Brian Cox 2016-06-12 17:27:36 -07:00
parent bb863522f2 202fd93c9d
commit 669e4c02ea
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/db/hierdatabase.cpp Normal file → Executable file
View File

@ -39,6 +39,7 @@
#include "core/archive.h"
#include "core/upperbound.h"
#include "core/errorbucket.h"
#include "core/errorbucketimpl.h"
// TODO -- all of these util_ functions should throw an eArchive if an attempt is made to
// write to a null address
@ -288,7 +289,19 @@ void cHierDatabaseIter::LoadArrayAt(const cHierAddr& addr) //throw (eArchive, eH
while( ! curAddr.IsNull() )
{
mEntries.push_back( cHierEntry() );
util_ReadObject( mpDb, &mEntries.back(), curAddr );
//Catch db errors, in case only part of db is broken
try
{
util_ReadObject( mpDb, &mEntries.back(), curAddr );
}
catch( eError& e )
{
e.SetFatality(false);
cErrorReporter::PrintErrorMsg(e);
mEntries.pop_back();
break;
}
curAddr = mEntries.back().mNext;
}