r19089@catbus: nickm | 2008-03-27 11:05:23 -0400

 Free some static hashtables and the log mutex on exit. Backport candidate.


svn:r14212

2 files changed, 9 insertions, 3 deletions

diff --git a/src/or/main.c b/src/or/main.c
index b569efde1b..6c75c3976a 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1849,13 +1849,15 @@ tor_free_all(int postfork)
   entry_guards_free_all();
   connection_free_all();
   buf_shrink_freelists(1);
-  policies_free_all();
   if (!postfork) {
     config_free_all();
     router_free_all();
+    policies_free_all();
   }
   free_cell_pool();
-  tor_tls_free_all();
+  if (!postfork) {
+    tor_tls_free_all();
+  }
   /* stuff in main.c */
   smartlist_free(connection_array);
   smartlist_free(closeable_connection_lst);
diff --git a/src/or/policies.c b/src/or/policies.c
index 31b7917e9c..2e66a00323 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -446,7 +446,7 @@ typedef struct policy_map_ent_t {
   addr_policy_t *policy;
 } policy_map_ent_t;
 
-static HT_HEAD(policy_map, policy_map_ent_t) policy_root;
+static HT_HEAD(policy_map, policy_map_ent_t) policy_root = HT_INITIALIZER();
 
 /** Return true iff a and b are equal. */
 static INLINE int
@@ -923,5 +923,9 @@ policies_free_all(void)
   authdir_reject_policy = NULL;
   addr_policy_list_free(authdir_invalid_policy);
   authdir_invalid_policy = NULL;
+
+  if (!HT_EMPTY(&policy_root))
+    log_warn(LD_MM, "Still had some address policies cached at shutdown.");
+  HT_CLEAR(policy_map, &policy_root);
 }