From: Roger Dingledine <arma@torproject.org>
Date: Tue, 29 Jun 2004 19:46:06 +0000 (+0000)
Subject: stop leaking options->ContactInfo on hup
X-Git-Tag: debian-version-0.0.7.1-1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=899bd4f47111173d66327fa228aca18bb3cb6d16;p=thirdparty%2Ftor.git

stop leaking options->ContactInfo on hup


svn:r1989
---

diff --git a/src/or/config.c b/src/or/config.c
index 10ac500288..ee3857a92a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -193,7 +193,7 @@ static int config_assign(or_options_t *options, struct config_line_t *list) {
     config_compare(list, "BandwidthRate",  CONFIG_TYPE_INT, &options->BandwidthRate) ||
     config_compare(list, "BandwidthBurst", CONFIG_TYPE_INT, &options->BandwidthBurst) ||
 
-    config_compare(list, "ContactInfo", CONFIG_TYPE_STRING, &options->ContactInfo) ||
+    config_compare(list, "ContactInfo",    CONFIG_TYPE_STRING, &options->ContactInfo) ||
 
     config_compare(list, "DebugLogFile",   CONFIG_TYPE_STRING, &options->DebugLogFile) ||
     config_compare(list, "DataDirectory",  CONFIG_TYPE_STRING, &options->DataDirectory) ||
@@ -470,6 +470,7 @@ static int resolve_my_address(or_options_t *options) {
 /** Release storage held by <b>options</b> */
 static void free_options(or_options_t *options) {
   config_free_lines(options->LogOptions);
+  tor_free(options->ContactInfo);
   tor_free(options->DebugLogFile);
   tor_free(options->DataDirectory);
   tor_free(options->RouterFile);