fix memory leak in router.c; start relying on NULL==(zero bytes)

svn:r2538

1 files changed, 1 insertions, 15 deletions

diff --git a/src/or/config.c b/src/or/config.c
index fe386d8df..41ccd56bd 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -492,22 +492,13 @@ static void
 init_options(or_options_t *options)
 {
   memset(options,0,sizeof(or_options_t));
-  options->LogOptions = NULL;
   options->ExitNodes = tor_strdup("");
   options->EntryNodes = tor_strdup("");
   options->StrictEntryNodes = options->StrictExitNodes = 0;
   options->ExcludeNodes = tor_strdup("");
   options->RendNodes = tor_strdup("");
   options->RendExcludeNodes = tor_strdup("");
-  options->ExitPolicy = NULL;
-  options->SocksPolicy = NULL;
-  options->SocksBindAddress = NULL;
-  options->ORBindAddress = NULL;
-  options->DirBindAddress = NULL;
-  options->OutboundBindAddress = NULL;
-  options->RecommendedVersions = NULL;
-  options->PidFile = NULL; // tor_strdup("tor.pid");
-  options->DataDirectory = NULL;
+  /* options->PidFile = tor_strdup("tor.pid"); */
   options->PathlenCoinWeight = 0.3;
   options->MaxConn = 900;
   options->DirFetchPostPeriod = 600;
@@ -517,11 +508,6 @@ init_options(or_options_t *options)
   options->BandwidthRate = 800000; /* at most 800kB/s total sustained incoming */
   options->BandwidthBurst = 10000000; /* max burst on the token bucket */
   options->NumCpus = 1;
-  options->RendConfigLines = NULL;
-  options->FirewallPorts = NULL;
-  options->DirServers = NULL;
-  options->MyFamily = NULL;
-  options->NodeFamilies = NULL;
 }
 
 static char *