[or-cvs] Fix a crash if you enable FascistFirewall but not FirewallP...

arma at seul.org arma at seul.org
Sat Jul 8 17:38:49 UTC 2006


Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	config.c 
Log Message:
Fix a crash if you enable FascistFirewall but not FirewallPorts.
Reported by Frediano Ziglio.


Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -p -d -r1.570 -r1.571
--- config.c	7 Jul 2006 17:33:29 -0000	1.570
+++ config.c	8 Jul 2006 17:38:46 -0000	1.571
@@ -2216,7 +2216,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. */



More information about the tor-commits mailing list