Fix crash in first-time option validation. Oops.

svn:r7018

diff --git a/src/or/config.c b/src/or/config.c
index 7f4525879c58007fa4289a881c389046a047c777..560428f4d79b2e30a562209c6b17538ebe44aa79 100644 (file)
--- 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) {