From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Wed, 21 Sep 2016 00:49:41 +0000 (-0600)
Subject: Cleanup cleanup: Reconfigure crashes after r13895.
X-Git-Tag: SQUID_4_0_15~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4addee0021aa026e1ca4c74ddc2c639fd84d3e9d;p=thirdparty%2Fsquid.git

Cleanup cleanup: Reconfigure crashes after r13895.

Reconfiguring crashes Squids that use tcp_outgoing_tos,
tcp_outgoing_dscp, tcp_outgoing_ds, clientside_tos, tcp_outgoing_mark,
or clientside_mark configuration directive.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 7c094473e4..50e453366d 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1487,7 +1487,7 @@ static void
 free_acl_tos(acl_tos ** head)
 {
     delete *head;
-    head = NULL;
+    *head = NULL;
 }
 
 #if SO_MARK && USE_LIBCAP
@@ -1540,7 +1540,7 @@ static void
 free_acl_nfmark(acl_nfmark ** head)
 {
     delete *head;
-    head = NULL;
+    *head = NULL;
 }
 #endif /* SO_MARK */