From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 2 Sep 2015 15:02:00 +0000 (-0400)
Subject: Fix crashes in tests
X-Git-Tag: tor-0.2.7.3-rc~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc64a6b2b9c1e0851ce4fc4fe410ac565f3c0137;p=thirdparty%2Ftor.git

Fix crashes in tests
---

diff --git a/src/or/config.c b/src/or/config.c
index 02b3477eaf..262eeeb153 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3173,7 +3173,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
              "http://freehaven.net/anonbib/#hs-attack06 for details.");
   }
 
-  if (routerset_is_list(options->EntryNodes) &&
+  if (options->EntryNodes &&
+      routerset_is_list(options->EntryNodes) &&
       (routerset_len(options->EntryNodes) == 1) &&
       (options->RendConfigLines != NULL)) {
     tor_asprintf(msg,