diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-08 09:38:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-08 09:38:48 -0500 |
| commit | 432852577000ab5eb07ae3ca961a36e5f6e796ba (patch) | |
| tree | c16e223660bac33feef1d362671056571dab5f90 | |
| parent | e8e89fd7a180ec54a8bdc4de09b69a4dc8f38f7d (diff) | |
| parent | b0867fec964a8692e9c605da82b3a3393eeaf451 (diff) | |
| download | tor-432852577000ab5eb07ae3ca961a36e5f6e796ba.tar.gz tor-432852577000ab5eb07ae3ca961a36e5f6e796ba.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
| -rw-r--r-- | changes/bug17781 | 3 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug17781 b/changes/bug17781 new file mode 100644 index 0000000000..01ed231b0a --- /dev/null +++ b/changes/bug17781 @@ -0,0 +1,3 @@ + o Compilation fixes: + - Fix a compilation warning with Clang 3.6: Do not check the + presence of an address which can never be NULL. Fixes bug 17781. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 49f9ba4978..d210f93fa1 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -744,7 +744,7 @@ 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) || |