From 6640fdeeee844f9da1f2c2dd57c65a87cb6b7df4 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 22 Jul 2007 22:51:07 +0000 Subject: [PATCH] r13872@catbus: nickm | 2007-07-22 18:51:02 -0400 esc_router_info static field should not be cleared postfork, to avoid races. svn:r10906 --- src/or/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 085d3044e0..5ff6232641 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1763,7 +1763,6 @@ tor_free_all(int postfork) 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 @@ tor_free_all(int postfork) 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. */ } } -- 2.47.3