ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-19 18:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix access to obsolete reference in PathRequest (RIPD-1219):

Browse Source 
* Don't access jvArray if newStatus is replaced
* Remove iLastLevel and use just iLevel
This commit is contained in:
JoelKatz
2016-06-30 11:07:11 -07:00
committed by seelabs
parent 16a38f3979
commit 2633949d5b
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ripple/app/paths/PathRequest.cpp
View File

@@ -52,7 +52,7 @@ PathRequest::PathRequest (
, jvStatus (Json::objectValue) , jvStatus (Json::objectValue)
, mLastIndex (0) , mLastIndex (0)
, mInProgress (false) , mInProgress (false)
, iLastLevel (0) , iLevel (0)
, bLastSuccess (false) , bLastSuccess (false)
, iIdentifier (id) , iIdentifier (id)
, created_ (std::chrono::steady_clock::now()) , created_ (std::chrono::steady_clock::now())
@@ -76,7 +76,7 @@ PathRequest::PathRequest (
, jvStatus (Json::objectValue) , jvStatus (Json::objectValue)
, mLastIndex (0) , mLastIndex (0)
, mInProgress (false) , mInProgress (false)
, iLastLevel (0) , iLevel (0)
, bLastSuccess (false) , bLastSuccess (false)
, iIdentifier (id) , iIdentifier (id)
, created_ (std::chrono::steady_clock::now()) , created_ (std::chrono::steady_clock::now())
@@ -651,7 +651,6 @@ Json::Value PathRequest::doUpdate(
if (jvId) if (jvId)
newStatus["id"] = jvId; newStatus["id"] = jvId;
int iLevel = iLastLevel;
bool loaded = app_.getFeeTrack().isLoadedLocal(); bool loaded = app_.getFeeTrack().isLoadedLocal();
if (iLevel == 0) if (iLevel == 0)
@@ -688,12 +687,17 @@ Json::Value PathRequest::doUpdate(
JLOG(m_journal.debug()) << iIdentifier JLOG(m_journal.debug()) << iIdentifier
<< " processing at level " << iLevel; << " processing at level " << iLevel;
Json::Value& jvArray = (newStatus[jss::alternatives] = Json::arrayValue); Json::Value jvArray = Json::arrayValue;
if (! findPaths(cache, iLevel, jvArray)) if (findPaths(cache, iLevel, jvArray))
{
bLastSuccess = jvArray.size() != 0;
newStatus[jss::alternatives] = std::move (jvArray);
}
else
{
bLastSuccess = false;
newStatus = rpcError(rpcINTERNAL); newStatus = rpcError(rpcINTERNAL);
}
bLastSuccess = jvArray.size();
iLastLevel = iLevel;
if (fast && quick_reply_ == steady_clock::time_point{}) if (fast && quick_reply_ == steady_clock::time_point{})
{ {

2
src/ripple/app/paths/PathRequest.h
View File

@@ -141,7 +141,7 @@ private:
LedgerIndex mLastIndex; LedgerIndex mLastIndex;
bool mInProgress; bool mInProgress;
int iLastLevel; int iLevel;
bool bLastSuccess; bool bLastSuccess;
int iIdentifier; int iIdentifier;