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

Fix the bug Andrey reported. A reference into an array can become invalid if

Browse Source 
the array changes size. This happened in the txn metadata code when we had
to thread while handling a node.
This commit is contained in:
JoelKatz
2012-10-20 12:52:25 -07:00
parent 7b8e445456
commit 4b2b75b367
3 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/LedgerEntrySet.cpp
View File

@@ -318,7 +318,7 @@ bool LedgerEntrySet::threadTx(SLE::ref threadTo, Ledger::ref ledger,
uint32 prevLgrID;
if (!threadTo->thread(mSet.getTxID(), mSet.getLgrSeq(), prevTxID, prevLgrID))
return false;
if (TransactionMetaSet::thread(mSet.getAffectedNode(threadTo->getIndex(), sfModifiedNode, false),
if (TransactionMetaSet::thread(mSet.getAffectedNode(threadTo->getIndex(), sfModifiedNode),
prevTxID, prevLgrID))
return true;
assert(false);
@@ -395,7 +395,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result)
continue;
SLE::pointer curNode = it->second.mEntry;
STObject &metaNode = mSet.getAffectedNode(it->first, *type, true);
mSet.setAffectedNode(it->first, *type);
if (type == &sfDeletedNode)
{
@@ -406,16 +406,16 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result)
{ // node has an amount, covers ripple state nodes
STAmount amount = origNode->getFieldAmount(sfAmount);
if (amount.isNonZero())
metaNode.setFieldAmount(sfPreviousBalance, amount);
mSet.getAffectedNode(it->first).setFieldAmount(sfPreviousBalance, amount);
amount = curNode->getFieldAmount(sfAmount);
if (amount.isNonZero())
metaNode.setFieldAmount(sfFinalBalance, amount);
mSet.getAffectedNode(it->first).setFieldAmount(sfFinalBalance, amount);
if (origNode->getType() == ltRIPPLE_STATE)
{
metaNode.setFieldAccount(sfLowID,
mSet.getAffectedNode(it->first).setFieldAccount(sfLowID,
NewcoinAddress::createAccountID(origNode->getFieldAmount(sfLowLimit).getIssuer()));
metaNode.setFieldAccount(sfHighID,
mSet.getAffectedNode(it->first).setFieldAccount(sfHighID,
NewcoinAddress::createAccountID(origNode->getFieldAmount(sfHighLimit).getIssuer()));
}
}
@@ -424,10 +424,10 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result)
{ // check for non-zero balances
STAmount amount = origNode->getFieldAmount(sfTakerPays);
if (amount.isNonZero())
metaNode.setFieldAmount(sfFinalTakerPays, amount);
mSet.getAffectedNode(it->first).setFieldAmount(sfFinalTakerPays, amount);
amount = origNode->getFieldAmount(sfTakerGets);
if (amount.isNonZero())
metaNode.setFieldAmount(sfFinalTakerGets, amount);
mSet.getAffectedNode(it->first).setFieldAmount(sfFinalTakerGets, amount);
}
}
@@ -451,17 +451,17 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result)
{ // node has an amount, covers account root nodes and ripple nodes
STAmount amount = origNode->getFieldAmount(sfAmount);
if (amount != curNode->getFieldAmount(sfAmount))
metaNode.setFieldAmount(sfPreviousBalance, amount);
mSet.getAffectedNode(it->first).setFieldAmount(sfPreviousBalance, amount);
}
if (origNode->getType() == ltOFFER)
{
STAmount amount = origNode->getFieldAmount(sfTakerPays);
if (amount != curNode->getFieldAmount(sfTakerPays))
metaNode.setFieldAmount(sfPreviousTakerPays, amount);
mSet.getAffectedNode(it->first).setFieldAmount(sfPreviousTakerPays, amount);
amount = origNode->getFieldAmount(sfTakerGets);
if (amount != curNode->getFieldAmount(sfTakerGets))
metaNode.setFieldAmount(sfPreviousTakerGets, amount);
mSet.getAffectedNode(it->first).setFieldAmount(sfPreviousTakerGets, amount);
}
}