From: Matthew Finkel <Matthew.Finkel@gmail.com>
Date: Wed, 9 Oct 2013 22:49:46 +0000 (+0000)
Subject: Free the smartlist after parsing csv config option
X-Git-Tag: tor-0.2.5.2-alpha~135^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=528e3bf8921372db9a97a9c624288e44f756188a;p=thirdparty%2Ftor.git

Free the smartlist after parsing csv config option

Bugfix on 1293835440dd4debf6fbfc66e755d9b9384aa362, which implemented
6752: Not in any released tor.
---

diff --git a/src/or/confparse.c b/src/or/confparse.c
index f2ada4f420..c5400a6512 100644
--- a/src/or/confparse.c
+++ b/src/or/confparse.c
@@ -392,7 +392,7 @@ config_assign_value(const config_format_t *fmt, void *options,
               "Interval in '%s %s' is malformed or out of bounds.",
               c->key, c->value);
           SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp));
-          smartlist_clear(csv_str);
+          smartlist_free(csv_str);
           return -1;
         }
         csv_int = tor_malloc_zero(sizeof(int));
@@ -401,7 +401,7 @@ config_assign_value(const config_format_t *fmt, void *options,
       }
     SMARTLIST_FOREACH_END(str);
     SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp));
-    smartlist_clear(csv_str);
+    smartlist_free(csv_str);
     break;
 
   case CONFIG_TYPE_LINELIST: