aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-12-02 15:37:24 -0500
committerNick Mathewson <nickm@torproject.org>2011-12-02 15:37:24 -0500
commitb7015603fa014c91056fa46cb012976a9e166cd3 (patch)
tree0e873829f55b7264a2f00b23aa44635145dc6eb1
parent3ebe960f3f734322ea3ea471ca6abceb245ca322 (diff)
downloadtor-b7015603fa014c91056fa46cb012976a9e166cd3.tar
tor-b7015603fa014c91056fa46cb012976a9e166cd3.tar.gz
Fix bug 4530; check return val of tor_addr_lookup correctly
Fix on 0.2.1.5-alpha; reported by troll_un
-rw-r--r--changes/bug45306
-rw-r--r--src/common/address.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug4530 b/changes/bug4530
new file mode 100644
index 000000000..7cd4726e5
--- /dev/null
+++ b/changes/bug4530
@@ -0,0 +1,6 @@
+ o Minor bugfixes:
+
+ - Correctly detect and handle transient lookup failures from
+ tor_addr_lookup. Fixes bug 4530; bugfix on 0.2.1.5-alpha.
+ Reported by "troll_un".
+
diff --git a/src/common/address.c b/src/common/address.c
index 46ccb1fe4..17bdea923 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1034,7 +1034,7 @@ tor_addr_port_parse(const char *s, tor_addr_t *addr_out, uint16_t *port_out)
++port;
}
- if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) < 0)
+ if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) != 0)
goto err;
tor_free(tmp);