From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Tue, 23 Jan 2018 21:08:02 +0000 (-0700)
Subject: Fixed store.cc "!mem_obj" assertion via peerDigestRequest (#134)
X-Git-Tag: M-staged-PR71~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dba7b5757f6d7255da305ea62ff6808addd907b9;p=thirdparty%2Fsquid.git

Fixed store.cc "!mem_obj" assertion via peerDigestRequest (#134)

Broken by commit 76d61119 which (correctly) made createMeObject() assert
but missed one case where the old code should have been converted to
call the new ensureMemObject() instead.

peerDigestRequest() is called every 5 minutes, triggered by the
peerDigestCheck event. Most calls find the old digest entry that has the
same method and URIs.
---

diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index 296792e78b..a8d9093f7a 100644
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -360,7 +360,7 @@ peerDigestRequest(PeerDigest * pd)
         debugs(72, 5, "peerDigestRequest: found old entry");
 
         old_e->lock("peerDigestRequest");
-        old_e->createMemObject(url, url, req->method);
+        old_e->ensureMemObject(url, url, req->method);
 
         fetch->old_sc = storeClientListAdd(old_e, fetch);
     }