[tor-commits] [tor/master] Fix clang warning, IPv6 address comment, buffer size typo

[nickm@xxxxxxxxxxxxxx]

commit 6fad395300a263badb443bf0feb936d4a554d020
Author: teor <teor2345@xxxxxxxxx>
Date:   Sat Dec 20 22:20:54 2014 +1100

    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.
---
 changes/bug14001-clang-warning |    6 ++++++
 src/or/connection_edge.c       |    3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug14001-clang-warning b/changes/bug14001-clang-warning
new file mode 100644
index 0000000..b932af6
--- /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 9ace375..a90ca00 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)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits