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

refactor: improve checking of path lengths (#4519)

Browse Source 
Improve the checking of the path lengths during Payments. Previously,
the code that did the check of the payment path lengths was sometimes
executed, but without any effect. This changes it to only check when it
matters, and to not make unnecessary copies of the path vectors.

Signed-off-by: Manoj Doshi <mdoshi@ripple.com>
This commit is contained in:
Alphonse Noni Mousse
2023-05-07 20:33:29 +00:00
committed by Manoj Doshi
parent 4f4951022c
commit b28f62bbd9
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ripple/app/tx/impl/Payment.cpp
View File

@@ -270,27 +270,17 @@ Payment::preclaim(PreclaimContext const& ctx)
return tecDST_TAG_NEEDED;
}
if (paths || sendMax || !saDstAmount.native())
// Payment with at least one intermediate step and uses transitive balances.
if ((paths || sendMax || !saDstAmount.native()) && ctx.view.open())
{
// Ripple payment with at least one intermediate step and uses
// transitive balances.
STPathSet const& paths = ctx.tx.getFieldPathSet(sfPaths);
// Copy paths into an editable class.
STPathSet const spsPaths = ctx.tx.getFieldPathSet(sfPaths);
auto pathTooBig = spsPaths.size() > MaxPathSize;
if (!pathTooBig)
for (auto const& path : spsPaths)
if (path.size() > MaxPathLength)
{
pathTooBig = true;
break;
}
if (ctx.view.open() && pathTooBig)
if (paths.size() > MaxPathSize ||
std::any_of(paths.begin(), paths.end(), [](STPath const& path) {
return path.size() > MaxPathLength;
}))
{
return telBAD_PATH_COUNT; // Too many paths for proposed ledger.
return telBAD_PATH_COUNT;
}
}
@@ -384,9 +374,6 @@ Payment::doApply()
}
}
// Copy paths into an editable class.
STPathSet spsPaths = ctx_.tx.getFieldPathSet(sfPaths);
path::RippleCalc::Input rcInput;
rcInput.partialPaymentAllowed = partialPaymentAllowed;
rcInput.defaultPathsAllowed = defaultPathsAllowed;
@@ -404,7 +391,7 @@ Payment::doApply()
saDstAmount,
uDstAccountID,
account_,
spsPaths,
ctx_.tx.getFieldPathSet(sfPaths),
ctx_.app.logs(),
&rcInput);
// VFALCO NOTE We might not need to apply, depending