Various memory leaks in configuration parsing

This lot are all small issues derived from allocating new memory and
assigning to a pointer already pointing at previous allocation, or
passing xstrdup() output to a caller which does not directly hold the
passed memory.
 Both cases will disappear once we clean up the string handling in Squid
but for now these still need fixing to avoid leaking memory.

 Detected by Coverity Scan. Issues 740430, 740432, 740439.

diff --git a/src/adaptation/icap/Options.cc b/src/adaptation/icap/Options.cc
index c79273510745a49e8483c2f4cc47d31fc6df01a1..219589c1de21a976c3c79cf88e31b2c06a4315c8 100644 (file)
--- a/src/adaptation/icap/Options.cc
+++ b/src/adaptation/icap/Options.cc
@@ -205,8 +205,11 @@ void Adaptation::Icap::Options::TransferList::parse(const String &buf, bool &fou
     while (strListGetItem(&buf, ',', &item, &ilen, &pos)) {
         if (ilen == 1 && *item == '*')
             foundStar = true;
-        else
-            add(xstrndup(item, ilen+1));
+        else {
+            const char *tmp = xstrndup(item, ilen+1);
+            add(tmp);
+            xfree(tmp);
+        }
     }
 }
 

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index c1807b61e2f4f0b7ba15ca6d7c162dd1002d75e5..ebb57a526f4555897d7e1e3e6dcb25c781c25461 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -594,6 +594,7 @@ parseOneConfigFile(const char *file_name, unsigned int depth)
     cfg_filename = orig_cfg_filename;
     config_lineno = orig_config_lineno;
 
+    xfree(tmp_line);
     return err_count;
 }
 

diff --git a/src/main.cc b/src/main.cc
index a0e91a12b66e2cfd5a9808d625dc4fbb10a8acb8..8a099935949917adbe58a81fb12cf58668fec020 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -543,6 +543,7 @@ mainParseOptions(int argc, char *argv[])
             /** \par l
              * Stores the syslog facility name in global opt_syslog_facility
              * then performs actions for -s option. */
+            xfree(opt_syslog_facility); // ignore any previous options sent
             opt_syslog_facility = xstrdup(optarg);
 
         case 's':