[or-cvs] r10906: esc_router_info static field should not be cleared postfork, (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-07-22 18:51:07 -0400 (Sun, 22 Jul 2007)
New Revision: 10906

Modified:
   tor/trunk/
   tor/trunk/src/or/main.c
Log:
 r13872 at catbus:  nickm | 2007-07-22 18:51:02 -0400
 esc_router_info static field should not be cleared postfork, to avoid races.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13872] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2007-07-22 22:49:49 UTC (rev 10905)
+++ tor/trunk/src/or/main.c	2007-07-22 22:51:07 UTC (rev 10906)
@@ -1763,7 +1763,6 @@
   routerlist_free_all();
   addressmap_free_all();
   set_exit_redirects(NULL); /* free the registered exit redirects */
-  esc_router_info(NULL); /* free a static field */
   dirserv_free_all();
   rend_service_free_all();
   rend_cache_free_all();
@@ -1787,10 +1786,11 @@
   smartlist_free(closeable_connection_lst);
   smartlist_free(active_linked_connection_lst);
   tor_free(timeout_event);
-  /* Stuff in util.c */
-  escaped(NULL);
+  /* Stuff in util.c */ 
   esc_router_info(NULL);
   if (!postfork) {
+    escaped(NULL);
+    esc_router_info(NULL);
     logs_free_all(); /* free log strings. do this last so logs keep working. */
   }
 }