[or-cvs] r7018: Fix crash in first-time option validation. Oops. (tor/trunk/src/or)

nickm at seul.org nickm at seul.org
Thu Aug 10 19:56:14 UTC 2006


Author: nickm
Date: 2006-08-10 15:56:10 -0400 (Thu, 10 Aug 2006)
New Revision: 7018

Modified:
   tor/trunk/src/or/config.c
Log:
Fix crash in first-time option validation. Oops.

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2006-08-10 10:47:44 UTC (rev 7017)
+++ tor/trunk/src/or/config.c	2006-08-10 19:56:10 UTC (rev 7018)
@@ -2075,10 +2075,10 @@
     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) {



More information about the tor-commits mailing list