[or-cvs] backport to stable branch: fix free-running-routers assert ...

Roger Dingledine arma at seul.org
Sun Jan 2 06:18:38 UTC 2005


Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/0091/tor/src/or

Modified Files:
      Tag: tor-0_0_9-patches
	routerparse.c 
Log Message:
backport to stable branch: fix free-running-routers assert trigger


Index: routerparse.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/routerparse.c,v
retrieving revision 1.94
retrieving revision 1.94.2.1
diff -u -d -r1.94 -r1.94.2.1
--- routerparse.c	4 Dec 2004 01:23:04 -0000	1.94
+++ routerparse.c	2 Jan 2005 06:18:36 -0000	1.94.2.1
@@ -546,8 +546,10 @@
 
   goto done;
  err:
-  running_routers_free(new_list);
-  new_list = NULL;
+  if (new_list) {
+    running_routers_free(new_list);
+    new_list = NULL;
+  }
  done:
   if (declared_key) crypto_free_pk_env(declared_key);
   if (tokens) {



More information about the tor-commits mailing list