summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-08-10 19:56:10 +0000
committerNick Mathewson <nickm@torproject.org>2006-08-10 19:56:10 +0000
commit02d42d91388d07e6bf1e49ce42bfe887f605fe33 (patch)
tree0ce85c46a0d1c38669395e2963070be122c45046
parent0a7d5b83711e665405eb51f19eee1b1a18fb71f0 (diff)
downloadtor-02d42d91388d07e6bf1e49ce42bfe887f605fe33.tar.gz
tor-02d42d91388d07e6bf1e49ce42bfe887f605fe33.zip
Fix crash in first-time option validation. Oops.
svn:r7018
-rw-r--r--src/or/config.c4
1 files changed, 2 insertions, 2 deletions
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) {