diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-07-08 18:34:33 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-07-08 18:34:33 +0000 |
| commit | 96b03affcb32f659c15a1fe3bb13e9cc18369165 (patch) | |
| tree | 62c21a82bb9a295e065b69442f5c673c33f9bc5c | |
| parent | c00846b7cdbb330a6696206c68bbb4be68aa2a2f (diff) | |
| download | tor-96b03affcb32f659c15a1fe3bb13e9cc18369165.tar.gz tor-96b03affcb32f659c15a1fe3bb13e9cc18369165.zip | |
backport: avoid a crash if the controller does a resetconf firewallports
and then a setconf fascistfirewall=1.
svn:r6747
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index fcc8befb43..410bf4ee67 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2189,7 +2189,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. */ |