------------------------------------------------------------
revno: 14086
revision-id: squid3@treenet.co.nz-20160923112248-1qvteivc0t3hgxnw
parent: squid3@treenet.co.nz-20160923111148-pjwuzgfvac43phk4
author: Alex Rousskov <rousskov@measurement-factory.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Fri 2016-09-23 23:22:48 +1200
message:
  Do not leak url_rewrite_extras and store_id_extras on reconfigure/shutdown.
  
  TODO: We should not create unneeded extras either.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160923112248-1qvteivc0t3hgxnw
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 859b1493e4e63328bbe29f45093ea8b71442f0e8
# timestamp: 2016-09-23 11:32:18 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160923111148-\
#   pjwuzgfvac43phk4
# 
# Begin patch
=== modified file 'src/redirect.cc'
--- src/redirect.cc	2016-01-01 00:14:27 +0000
+++ src/redirect.cc	2016-09-23 11:22:48 +0000
@@ -369,11 +369,13 @@
     }
 
     if (Config.redirector_extras) {
+        delete redirectorExtrasFmt;
         redirectorExtrasFmt = new ::Format::Format("url_rewrite_extras");
         (void)redirectorExtrasFmt->parse(Config.redirector_extras);
     }
 
     if (Config.storeId_extras) {
+        delete storeIdExtrasFmt;
         storeIdExtrasFmt = new ::Format::Format("store_id_extras");
         (void)storeIdExtrasFmt->parse(Config.storeId_extras);
     }
@@ -388,9 +390,6 @@
      * When and if needed for more helpers a separated shutdown
      * method will be added for each of them.
      */
-    if (!storeIds && !redirectors)
-        return;
-
     if (redirectors)
         helperShutdown(redirectors);