diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-12-02 15:38:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-12-02 15:38:29 -0500 |
| commit | 0920cd02f4c49b64d30879b18c4287384a36d9f1 (patch) | |
| tree | 4f632378f8e97ef7accbd174e43843e92862a1e0 | |
| parent | cd10013218a6b1cc42568eb91ed9372e6caddf1f (diff) | |
| parent | b7015603fa014c91056fa46cb012976a9e166cd3 (diff) | |
| download | tor-0920cd02f4c49b64d30879b18c4287384a36d9f1.tar.gz tor-0920cd02f4c49b64d30879b18c4287384a36d9f1.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug4530 | 6 | ||||
| -rw-r--r-- | src/common/address.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug4530 b/changes/bug4530 new file mode 100644 index 0000000000..7cd4726e57 --- /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 ab056f427e..c53368743f 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1064,7 +1064,7 @@ tor_addr_port_lookup(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); |