ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be more careful not to tamper with an acquired ledger/map after

Browse Source 
it has completed.
This commit is contained in:
JoelKatz
2013-03-16 18:22:35 -07:00
parent 47ffc5ff12
commit a12c72f422
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,6 +270,7 @@ void LedgerAcquire::done()
else else
theApp->getMasterLedgerAcquire().logFailure(mHash); theApp->getMasterLedgerAcquire().logFailure(mHash);
// FIXME: We hold the PeerSet lock
for (unsigned int i = 0; i < triggers.size(); ++i) for (unsigned int i = 0; i < triggers.size(); ++i)
triggers[i](shared_from_this()); triggers[i](shared_from_this());
} }
@@ -591,7 +592,7 @@ bool LedgerAcquire::takeBase(const std::string& data) // data must not have hash
cLog(lsTRACE) << "got base acquiring ledger " << mHash; cLog(lsTRACE) << "got base acquiring ledger " << mHash;
#endif #endif
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
if (mHaveBase) if (mComplete || mFailed || mHaveBase)
return true; return true;
mLedger = boost::make_shared<Ledger>(data, false); mLedger = boost::make_shared<Ledger>(data, false);
if (mLedger->getHash() != mHash) if (mLedger->getHash() != mHash)
@@ -626,7 +627,7 @@ bool LedgerAcquire::takeTxNode(const std::list<SHAMapNode>& nodeIDs,
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
if (!mHaveBase) if (!mHaveBase)
return false; return false;
if (mHaveTransactions) if (mHaveTransactions || mFailed)
return true; return true;
std::list<SHAMapNode>::const_iterator nodeIDit = nodeIDs.begin(); std::list<SHAMapNode>::const_iterator nodeIDit = nodeIDs.begin();
@@ -673,7 +674,7 @@ bool LedgerAcquire::takeAsNode(const std::list<SHAMapNode>& nodeIDs,
cLog(lsWARNING) << "Don't have ledger base"; cLog(lsWARNING) << "Don't have ledger base";
return false; return false;
} }
if (mHaveState) if (mHaveState || mFailed)
return true; return true;
std::list<SHAMapNode>::const_iterator nodeIDit = nodeIDs.begin(); std::list<SHAMapNode>::const_iterator nodeIDit = nodeIDs.begin();
@@ -714,6 +715,8 @@ bool LedgerAcquire::takeAsNode(const std::list<SHAMapNode>& nodeIDs,
bool LedgerAcquire::takeAsRootNode(const std::vector<unsigned char>& data, SMAddNode& san) bool LedgerAcquire::takeAsRootNode(const std::vector<unsigned char>& data, SMAddNode& san)
{ {
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
if (mFailed || mHaveState)
return true;
if (!mHaveBase) if (!mHaveBase)
return false; return false;
AccountStateSF tFilter(mLedger->getLedgerSeq()); AccountStateSF tFilter(mLedger->getLedgerSeq());
@@ -724,6 +727,8 @@ bool LedgerAcquire::takeAsRootNode(const std::vector<unsigned char>& data, SMAdd
bool LedgerAcquire::takeTxRootNode(const std::vector<unsigned char>& data, SMAddNode& san) bool LedgerAcquire::takeTxRootNode(const std::vector<unsigned char>& data, SMAddNode& san)
{ {
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
if (mFailed || mHaveState)
return true;
if (!mHaveBase) if (!mHaveBase)
return false; return false;
TransactionStateSF tFilter(mLedger->getLedgerSeq()); TransactionStateSF tFilter(mLedger->getLedgerSeq());