[or-cvs] bugfix: only try to parse the TorVersion if there is one.

arma at seul.org arma at seul.org
Mon Jan 2 04:58:14 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:
bugfix: only try to parse the TorVersion if there is one.


Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -p -d -r1.474 -r1.475
--- config.c	2 Jan 2006 04:45:18 -0000	1.474
+++ config.c	2 Jan 2006 04:58:12 -0000	1.475
@@ -3531,7 +3531,7 @@ or_state_validate(or_state_t *old_state,
     warn(LD_GENERAL, "Unable to parse entry nodes: %s", err);
     return -1;
   }
-  if (tor_version_parse(state->TorVersion, &v)) {
+  if (state->TorVersion && tor_version_parse(state->TorVersion, &v)) {
     warn(LD_GENERAL, "Can't parse Tor version '%s' from your state file. "
          "Proceeding anyway.", state->TorVersion);
   }



More information about the tor-commits mailing list