From: Eduard Bagdasaryan <eduard.bagdasaryan@measurement-factory.com>
Date: Fri, 6 Jul 2018 12:34:30 +0000 (+0000)
Subject: Do not assign nil values in ACLFilledChecklist::syncAle() (#240)
X-Git-Tag: SQUID_4_2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=026f9c2858dd706ced2ac91163ae99ebb34e2de9;p=thirdparty%2Fsquid.git

Do not assign nil values in ACLFilledChecklist::syncAle() (#240)

Being explicit about nil parameters protects (future) code from
dereferencing them.
---

diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc
index b5ce7d21ac..27c49a8111 100644
--- a/src/acl/FilledChecklist.cc
+++ b/src/acl/FilledChecklist.cc
@@ -132,11 +132,11 @@ ACLFilledChecklist::syncAle(HttpRequest *adaptedRequest, const char *logUri) con
 {
     if (!al)
         return;
-    if (!al->adapted_request) {
+    if (adaptedRequest && !al->adapted_request) {
         al->adapted_request = adaptedRequest;
         HTTPMSGLOCK(al->adapted_request);
     }
-    if (al->url.isEmpty())
+    if (logUri && al->url.isEmpty())
         al->url = logUri;
 }