From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 10 Aug 2006 19:56:10 +0000 (+0000)
Subject: Fix crash in first-time option validation. Oops.
X-Git-Tag: tor-0.1.2.1-alpha~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02d42d91388d07e6bf1e49ce42bfe887f605fe33;p=thirdparty%2Ftor.git

Fix crash in first-time option validation. Oops.

svn:r7018
---

diff --git a/src/or/config.c b/src/or/config.c
index 7f4525879c..560428f4d7 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2075,10 +2075,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
     const char *tp = is_socks ? "SOCKS proxy" : "transparent proxy";
     if (is_socks) {
       opt = options->SocksListenAddress;
-      old = old_options->SocksListenAddress;
+      old = old_options ? old_options->SocksListenAddress : NULL;
     } else {
       opt = options->TransListenAddress;
-      old = old_options->TransListenAddress;
+      old = old_options ? old_options->TransListenAddress : NULL;
     }
 
     for (line = opt; line; line = line->next) {