commit 443e4ae1ee0520cead27dd3a21e9f79b1bed8f8b Merge: ce4add4 1c30e6a Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 27 16:07:04 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

Conflicts: src/or/policies.c

changes/bug6690 | 7 +++++++ src/or/policies.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletions(-)

diff --cc src/or/policies.c index 3018803,55d08af..6e98421 --- a/src/or/policies.c +++ b/src/or/policies.c @@@ -711,8 -684,12 +711,12 @@@ compare_tor_addr_to_addr_policy(const t if (!policy) { /* no policy? accept all. */ return ADDR_POLICY_ACCEPTED; - } else if (tor_addr_is_null(addr)) { + } else if (addr == NULL || tor_addr_is_null(addr)) { - tor_assert(port != 0); + if (port == 0) { + log_info(LD_BUG, "Rejecting null address with 0 port (family %d)", + addr ? tor_addr_family(addr) : -1); + return ADDR_POLICY_REJECTED; + } return compare_unknown_tor_addr_to_addr_policy(port, policy); } else if (port == 0) { return compare_known_tor_addr_to_addr_policy_noport(addr, policy);