From: Roger Dingledine <arma@torproject.org>
Date: Tue, 17 Aug 2004 11:52:20 +0000 (+0000)
Subject: bugfix: make receiving csv lines not seg fault
X-Git-Tag: tor-0.0.8rc1~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0131d94a6c7759e0160b946aea2d341eb06dead3;p=thirdparty%2Ftor.git

bugfix: make receiving csv lines not seg fault


svn:r2260
---

diff --git a/src/or/config.c b/src/or/config.c
index 60f1a42c6f..27bb3faf03 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -200,12 +200,9 @@ static int config_compare(struct config_line_t *c, const char *key, config_type_
       *(double *)arg = atof(c->value);
       break;
     case CONFIG_TYPE_CSV:
-      if (arg) {
-        SMARTLIST_FOREACH((smartlist_t*)arg, char *, cp, tor_free(cp));
-        smartlist_free((smartlist_t*)arg);
-      }
-      arg = smartlist_create();
-      parse_csv_into_smartlist(arg, c->value);
+      if(*(smartlist_t**)arg == NULL)
+        *(smartlist_t**)arg = smartlist_create();
+      parse_csv_into_smartlist(*(smartlist_t**)arg, c->value);
       break;
     case CONFIG_TYPE_LINELIST:
       /* Note: this reverses the order that the lines appear in.  That's