From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sat, 27 Jun 2020 04:13:43 +0000 (+0000)
Subject: Generated config dumping code does not skip unconfigured options (#684)
X-Git-Tag: 4.15-20210522-snapshot~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=182d433a5aa69a7f94ae52e536022cfaf3c20450;p=thirdparty%2Fsquid.git

Generated config dumping code does not skip unconfigured options (#684)

We must manually skip them. This fix is needed after commit 1c2b446.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 87b898209b..fc43e92942 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -5127,7 +5127,9 @@ parse_http_upgrade_request_protocols(HttpUpgradeProtocolAccess **protoGuardsPtr)
 static void
 dump_http_upgrade_request_protocols(StoreEntry *entry, const char *rawName, HttpUpgradeProtocolAccess *protoGuards)
 {
-    assert(protoGuards);
+    if (!protoGuards)
+        return;
+
     const SBuf name(rawName);
     protoGuards->forEach([entry,&name](const SBuf &proto, const acl_access *acls) {
         SBufList line;