[or-cvs] backport: avoid a crash if the controller does a resetconf ...

[arma at seul.org]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/tor-011x/tor/src/or

Modified Files:
      Tag: tor-0_1_1-patches
	config.c 
Log Message:
backport: avoid a crash if the controller does a resetconf firewallports
and then a setconf fascistfirewall=1.


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.554.2.7
retrieving revision 1.554.2.8
diff -u -p -d -r1.554.2.7 -r1.554.2.8
--- config.c	10 Jun 2006 00:59:39 -0000	1.554.2.7
+++ config.c	8 Jul 2006 18:34:33 -0000	1.554.2.8
@@ -2189,7 +2189,7 @@ options_validate(or_options_t *old_optio
     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. */