From 676293ec42050244157f357fd72cf9978d780e2c Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 16 Jan 2015 14:02:59 -0800 Subject: [PATCH] Ensure account_tx queries over and returns correct range --- src/ripple/rpc/handlers/AccountTx.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ripple/rpc/handlers/AccountTx.cpp b/src/ripple/rpc/handlers/AccountTx.cpp index 95c41ec34a..3e6621cc66 100644 --- a/src/ripple/rpc/handlers/AccountTx.cpp +++ b/src/ripple/rpc/handlers/AccountTx.cpp @@ -69,8 +69,10 @@ Json::Value doAccountTx (RPC::Context& context) std::int64_t iLedgerMax = params.isMember ("ledger_index_max") ? params["ledger_index_max"].asInt () : -1; - uLedgerMin = iLedgerMin == -1 ? uValidatedMin : iLedgerMin; - uLedgerMax = iLedgerMax == -1 ? uValidatedMax : iLedgerMax; + uLedgerMin = iLedgerMin == -1 ? uValidatedMin : + ((iLedgerMin >= uValidatedMin) ? iLedgerMin : uValidatedMin); + uLedgerMax = iLedgerMax == -1 ? uValidatedMax : + ((iLedgerMax <= uValidatedMax) ? iLedgerMax : uValidatedMax); if (uLedgerMax < uLedgerMin) return rpcError (rpcLGR_IDXS_INVALID);