Avoid a memory corruption problem related to "private" in DirPolicy.

This is a posible fix for bug 996.

diff --git a/ChangeLog b/ChangeLog
index b2ba413511dd2ec44aec92c5b8842868bd801cd4..29d1c0e4438caf00b89c89f5ef5ef7b9d00177e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,9 @@ Changes in version 0.2.1.14-rc - 2009-04-12
       patch by Sebastian.
     - Avoid crashing in the presence of certain malformed descriptors.
       Found by lark, and by automated fuzzing.
+    - Avoid crashing when we have "private" in a policy specified in
+      a DirPolicy or SocksPolicy or ReachableAddresses option and we
+      re-load the policy.  May fix bug 996.
 
   o Minor features:
     - When generating circuit events with verbose nicknames for

diff --git a/src/or/policies.c b/src/or/policies.c
index cb914d11f6c502d07d99d8bd241dcf741b3a89b1..d55e86c184e604bfd41719959f133f02a96131a6 100644 (file)
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -411,6 +411,7 @@ load_policy_from_option(config_line_t *config, smartlist_t **policy,
         memcpy(&newp, n, sizeof(newp));
         newp.prt_min = 1;
         newp.prt_max = 65535;
+        newp.is_canonical = 0;
         c = addr_policy_get_canonical_entry(&newp);
         SMARTLIST_REPLACE_CURRENT(*policy, n, c);
         addr_policy_free(n);