ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-28 15:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't blow up if asked to acquire a hash that's not a ledger.

Browse Source
This commit is contained in:
JoelKatz
2013-01-09 03:16:59 -08:00
parent c74a1b89e3
commit 0778a3ebae
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpp/ripple/LedgerAcquire.cpp
View File

@@ -90,7 +90,11 @@ bool LedgerAcquire::tryLocal()
return false;
mLedger = boost::make_shared<Ledger>(strCopy(node->getData()), true);
assert(mLedger->getHash() == mHash);
if (mLedger->getHash() != mHash)
{ // We know for a fact the ledger can never be acquired
mFailed = true;
return true;
}
mHaveBase = true;
if (!mLedger->getTransHash())
@@ -236,7 +240,7 @@ void LedgerAcquire::trigger(Peer::ref peer)
{
tmGL.set_querytype(ripple::qtINDIRECT);
if (!isProgress() && mByHash)
if (!isProgress() && !mFailed && mByHash)
{
std::vector<neededHash_t> need = getNeededHashes();
if (!need.empty())
@@ -287,7 +291,7 @@ void LedgerAcquire::trigger(Peer::ref peer)
}
if (!mHaveBase)
if (!mHaveBase && !mFailed)
{
tmGL.set_itype(ripple::liBASE);
cLog(lsTRACE) << "Sending base request to " << (peer ? "selected peer" : "all peers");
@@ -299,7 +303,7 @@ void LedgerAcquire::trigger(Peer::ref peer)
if (mLedger)
tmGL.set_ledgerseq(mLedger->getLedgerSeq());
if (mHaveBase && !mHaveTransactions)
if (mHaveBase && !mHaveTransactions && !mFailed)
{
assert(mLedger);
if (mLedger->peekTransactionMap()->getHash().isZero())
@@ -340,7 +344,7 @@ void LedgerAcquire::trigger(Peer::ref peer)
}
}
if (mHaveBase && !mHaveState)
if (mHaveBase && !mHaveState && !mFailed)
{
assert(mLedger);
if (mLedger->peekAccountStateMap()->getHash().isZero())