From 5ce5634d8ff36cec653906518597d89c66e7a6ff Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 5 Aug 2013 11:47:28 -0700 Subject: [PATCH] Don't let a placed offer take an expired crossing offer. --- src/cpp/ripple/OfferCreateTransactor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpp/ripple/OfferCreateTransactor.cpp b/src/cpp/ripple/OfferCreateTransactor.cpp index c74ade445f..7eb04c0706 100644 --- a/src/cpp/ripple/OfferCreateTransactor.cpp +++ b/src/cpp/ripple/OfferCreateTransactor.cpp @@ -8,7 +8,7 @@ SETUP_LOG (OfferCreateTransactor) // Make sure an offer is still valid. If not, mark it unfunded. bool OfferCreateTransactor::bValidOffer ( - SLE::ref sleOfferDir, + SLE::ref sleOffer, uint256 const& uOfferIndex, const uint160& uOfferOwnerID, const STAmount& saOfferPays, @@ -21,7 +21,7 @@ bool OfferCreateTransactor::bValidOffer ( { bool bValid; - if (sleOfferDir->isFieldPresent (sfExpiration) && sleOfferDir->getFieldU32 (sfExpiration) <= mEngine->getLedger ()->getParentCloseTimeNC ()) + if (sleOffer->isFieldPresent (sfExpiration) && sleOffer->getFieldU32 (sfExpiration) <= mEngine->getLedger ()->getParentCloseTimeNC ()) { // Offer is expired. Expired offers are considered unfunded. Delete it. WriteLog (lsINFO, OfferCreateTransactor) << "bValidOffer: encountered expired offer"; @@ -222,7 +222,7 @@ TER OfferCreateTransactor::takeOffers ( bool bValid; bValid = bValidOffer ( - sleOfferDir, uOfferIndex, uOfferOwnerID, saOfferPays, saOfferGets, + sleOffer, uOfferIndex, uOfferOwnerID, saOfferPays, saOfferGets, uTakerAccountID, usOfferUnfundedFound, usOfferUnfundedBecame, usAccountTouched, saOfferFunds);