diff options
| author | teor <teor2345@gmail.com> | 2014-12-20 22:20:54 +1100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-12-21 13:35:03 -0500 |
| commit | 6fad395300a263badb443bf0feb936d4a554d020 (patch) | |
| tree | 37c85108cd9698d72d8079d5d57a85f34486be34 | |
| parent | 3d85df956905453413918866ffa4dc07b86e7f1b (diff) | |
| download | tor-6fad395300a263badb443bf0feb936d4a554d020.tar.gz tor-6fad395300a263badb443bf0feb936d4a554d020.zip | |
Fix clang warning, IPv6 address comment, buffer size typo
The address of an array in the middle of a structure will
always be non-NULL. clang recognises this and complains.
Disable the tautologous and redundant check to silence
this warning.
Fixes bug 14001.
| -rw-r--r-- | changes/bug14001-clang-warning | 6 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug14001-clang-warning b/changes/bug14001-clang-warning new file mode 100644 index 0000000000..b932af6ab7 --- /dev/null +++ b/changes/bug14001-clang-warning @@ -0,0 +1,6 @@ + o Minor bugfixes: + - The address of an array in the middle of a structure will + always be non-NULL. clang recognises this and complains. + Disable the tautologous and redundant check to silence + this warning. + Fixes bug 14001. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 9ace375d74..a90ca00883 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -744,8 +744,9 @@ connection_ap_fail_onehop(const char *failed_digest, /* we don't know the digest; have to compare addr:port */ tor_addr_t addr; if (!build_state || !build_state->chosen_exit || - !entry_conn->socks_request || !entry_conn->socks_request->address) + !entry_conn->socks_request) { continue; + } if (tor_addr_parse(&addr, entry_conn->socks_request->address)<0 || !tor_addr_eq(&build_state->chosen_exit->addr, &addr) || build_state->chosen_exit->port != entry_conn->socks_request->port) |