From fa2f72ded752689fc0ece225b9d8279ddd13b88d Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 4 Sep 2008 20:42:02 +0000 Subject: [PATCH] An asterisk makes a difference sometimes. Fixes bug 809. svn:r16758 --- ChangeLog | 3 +++ src/common/address.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d7d60fd59e..3242e9f5f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx o Minor bugfixes: - Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha. Reported by Tas. + - When parsing ports in tor_addr_port_parse(), yield the port if + the port variable is provided, not just if it's nonzero. Fixes + bug 809. Bugfix on 0.2.1.5-alpha. o Minor features: - Use a lockfile to make sure that two Tor processes are not diff --git a/src/common/address.c b/src/common/address.c index 3c6eb6f5ac..c7483af09c 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -917,7 +917,7 @@ tor_addr_port_parse(const char *s, tor_addr_t *addr_out, uint16_t *port_out) portval = 0; } - if (*port_out) + if (port_out) *port_out = portval; tor_addr_copy(addr_out, &addr);