fixup: Slightly safer destinationReceipt cleanup

* Removed cleanupOnFail()/saveError() call order dependency.
* Do not leave invalidated destinationReceipt behind reinstatePath()

diff --git a/src/FwdState.cc b/src/FwdState.cc
index d1f14a006e851099898e4bfb0acb08feac644080..0bd0d862ab0fa8c622d27ad0bf439e15e5ba679e 100644 (file)
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -463,6 +463,7 @@ FwdState::fail(ErrorState * errorState)
 {
     cleanupOnFail(errorState->type);
     saveError(errorState);
+    destinationReceipt = nullptr; // may already be nil
 }
 
 /// remembers an error for future use
@@ -474,8 +475,6 @@ FwdState::saveError(ErrorState *errorState)
     delete err;
     err = errorState;
 
-    destinationReceipt = nullptr;
-
     if (!errorState->request)
         errorState->request = request;
 }
@@ -490,8 +489,10 @@ FwdState::cleanupOnFail(const err_type errType)
     if (pconnRace == racePossible) {
         debugs(17, 5, "pconn race happened");
         pconnRace = raceHappened;
-        if (destinationReceipt)
+        if (destinationReceipt) {
             destinations->reinstatePath(destinationReceipt);
+            destinationReceipt = nullptr;
+        }
     }
 
     if (ConnStateData *pinned_connection = request->pinnedConnection()) {