summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-07-08 17:38:46 +0000
committerRoger Dingledine <arma@torproject.org>2006-07-08 17:38:46 +0000
commit51454157a0646b91f0d024477a0ee185f82df58b (patch)
treeae1fd2653c6de01e070cb60cde23ec392899c1e0 /src
parent0bbc4aca9bbfc3bff7bf73f2027e1793e2842d98 (diff)
downloadtor-51454157a0646b91f0d024477a0ee185f82df58b.tar.gz
tor-51454157a0646b91f0d024477a0ee185f82df58b.zip
Fix a crash if you enable FascistFirewall but not FirewallPorts.
Reported by Frediano Ziglio. svn:r6746
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index eda2631976..c4207fcb0f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2216,7 +2216,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
return -1;
if (options->FascistFirewall && !options->ReachableAddresses) {
- if (smartlist_len(options->FirewallPorts)) {
+ if (options->FirewallPorts && smartlist_len(options->FirewallPorts)) {
/* We already have firewall ports set, so migrate them to
* ReachableAddresses, which will set ReachableORAddresses and
* ReachableDirAddresses if they aren't set explicitly. */