ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

An assert in NetworkOPs.cpp line 850 was reported. This suggests a mutable

Browse Source 
ledger came from the ledger master's "ledger by hash" table. This fixes an
obvious way that this can happen (that seems incredibly rare and requires a
transaction / ledger acquire race with a very narrow window) and adds some
extra asserts to try to catch this earlier.
This commit is contained in:
JoelKatz
2013-01-23 10:14:20 -08:00
parent 122593d0c1
commit e25863207a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cpp/ripple/LedgerHistory.cpp
View File

@@ -24,6 +24,7 @@ LedgerHistory::LedgerHistory() : mLedgersByHash("LedgerCache", CACHED_LEDGER_NUM
void LedgerHistory::addLedger(Ledger::pointer ledger)
{
assert(ledger->isImmutable());
mLedgersByHash.canonicalize(ledger->getHash(), ledger, true);
}
@@ -78,13 +79,17 @@ Ledger::pointer LedgerHistory::getLedgerByHash(const uint256& hash)
{
Ledger::pointer ret = mLedgersByHash.fetch(hash);
if (ret)
{
assert(ret->getHash() == hash);
return ret;
}
ret = Ledger::loadByHash(hash);
if (!ret)
return ret;
assert(ret->getHash() == hash);
mLedgersByHash.canonicalize(ret->getHash(), ret);
assert(ret->getHash() == hash);
return ret;
}

5
src/cpp/ripple/LedgerMaster.h
View File

@@ -105,10 +105,11 @@ public:
Ledger::pointer getLedgerByHash(const uint256& hash)
{
if (hash.isZero())
return mCurrentLedger;
return boost::make_shared<Ledger>(boost::ref(*mCurrentLedger), false);
if (mCurrentLedger && (mCurrentLedger->getHash() == hash))
return mCurrentLedger;
return boost::make_shared<Ledger>(boost::ref(*mCurrentLedger), false);
if (mFinalizedLedger && (mFinalizedLedger->getHash() == hash))
return mFinalizedLedger;