June 2016 - tor-commits - lists.torproject.org

[tor/master] Add -Wduplicated-cond on GCC 6
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit 12517c73039afa5632b475a447e277a0ec73fbd5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 12:05:08 2016 -0400 Add -Wduplicated-cond on GCC 6 --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 4878d2b..d9149e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1777,6 +1777,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ if test "x$have_gcc6" = "xyes"; then CFLAGS="$CFLAGS -Wignored-attributes -Wshift-negative-value -Wshift-overflow=2" CFLAGS="$CFLAGS -Wnull-dereference" + CFLAGS="$CFLAGS -Wduplicated-cond" fi if test "x$have_shorten64_flag" = "xyes"; then

1 0

[tor/master] Enable -Wnull-dereference (GCC >=6.1), and fix the easy cases
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit 4f8086fb20e93c477f033f58da17aa31b9c29fd6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 11:12:58 2016 -0400 Enable -Wnull-dereference (GCC >=6.1), and fix the easy cases This warning, IIUC, means that the compiler doesn't like it when it sees a NULL check _after_ we've already dereferenced the variable. In such cases, it considers itself free to eliminate the NULL check. There are a couple of tricky cases: One was the case related to the fact that tor_addr_to_in6() can return NULL if it gets a non-AF_INET6 address. The fix was to create a variant which asserts on the address type, and never returns NULL. --- configure.ac | 1 + src/common/address.c | 3 ++- src/common/address.h | 16 +++++++++++++--- src/ext/ht.h | 2 ++ src/or/channeltls.c | 1 + src/or/connection.c | 2 +- src/or/geoip.c | 8 ++++---- src/test/test_bt_cl.c | 6 ++++++ 8 files changed, 30 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index ec56e02..4878d2b 100644 --- a/configure.ac +++ b/configure.ac @@ -1776,6 +1776,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ if test "x$have_gcc6" = "xyes"; then CFLAGS="$CFLAGS -Wignored-attributes -Wshift-negative-value -Wshift-overflow=2" + CFLAGS="$CFLAGS -Wnull-dereference" fi if test "x$have_shorten64_flag" = "xyes"; then diff --git a/src/common/address.c b/src/common/address.c index a6e0f3f..759b20a 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -131,7 +131,8 @@ tor_addr_to_sockaddr(const tor_addr_t *a, #endif sin6->sin6_family = AF_INET6; sin6->sin6_port = htons(port); - memcpy(&sin6->sin6_addr, tor_addr_to_in6(a), sizeof(struct in6_addr)); + memcpy(&sin6->sin6_addr, tor_addr_to_in6_assert(a), + sizeof(struct in6_addr)); return sizeof(struct sockaddr_in6); } else { return 0; diff --git a/src/common/address.h b/src/common/address.h index 3de67e1..3f0bb52 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -74,6 +74,7 @@ typedef struct tor_addr_port_t #define TOR_ADDR_NULL {AF_UNSPEC, {0}} static inline const struct in6_addr *tor_addr_to_in6(const tor_addr_t *a); +static inline const struct in6_addr *tor_addr_to_in6_assert(const tor_addr_t *a); static inline uint32_t tor_addr_to_ipv4n(const tor_addr_t *a); static inline uint32_t tor_addr_to_ipv4h(const tor_addr_t *a); static inline uint32_t tor_addr_to_mapped_ipv4h(const tor_addr_t *a); @@ -97,21 +98,30 @@ tor_addr_to_in6(const tor_addr_t *a) return a->family == AF_INET6 ? &a->addr.in6_addr : NULL; } +/** As tor_addr_to_in6, but assert that the address truly is an IPv6 address. */ +static inline const struct in6_addr * +tor_addr_to_in6_assert(const tor_addr_t *a) +{ + tor_assert(a->family == AF_INET6); + return &a->addr.in6_addr; +} + /** Given an IPv6 address x, yield it as an array of uint8_t. * * Requires that x is actually an IPv6 address. */ -#define tor_addr_to_in6_addr8(x) tor_addr_to_in6(x)->s6_addr +#define tor_addr_to_in6_addr8(x) tor_addr_to_in6_assert(x)->s6_addr + /** Given an IPv6 address x, yield it as an array of uint16_t. * * Requires that x is actually an IPv6 address. */ -#define tor_addr_to_in6_addr16(x) S6_ADDR16(*tor_addr_to_in6(x)) +#define tor_addr_to_in6_addr16(x) S6_ADDR16(*tor_addr_to_in6_assert(x)) /** Given an IPv6 address x, yield it as an array of uint32_t. * * Requires that x is actually an IPv6 address. */ -#define tor_addr_to_in6_addr32(x) S6_ADDR32(*tor_addr_to_in6(x)) +#define tor_addr_to_in6_addr32(x) S6_ADDR32(*tor_addr_to_in6_assert(x)) /** Return an IPv4 address in network order for a, or 0 if * a is not an IPv4 address. */ diff --git a/src/ext/ht.h b/src/ext/ht.h index 28d1fe4..1b6cbe6 100644 --- a/src/ext/ht.h +++ b/src/ext/ht.h @@ -203,6 +203,7 @@ ht_string_hash(const char *s) name##_HT_GROW(head, head->hth_n_entries+1); \ HT_SET_HASH_(elm, field, hashfn); \ p = name##_HT_FIND_P_(head, elm); \ + HT_ASSERT_(p != NULL); /* this holds because we called HT_GROW */ \ r = *p; \ *p = elm; \ if (r && (r!=elm)) { \ @@ -470,6 +471,7 @@ ht_string_hash(const char *s) name##_HT_GROW(var##_head_, var##_head_->hth_n_entries+1); \ HT_SET_HASH_((elm), field, hashfn); \ var = name##_HT_FIND_P_(var##_head_, (elm)); \ + HT_ASSERT_(var); /* Holds because we called HT_GROW */ \ if (*var) { \ y; \ } else { \ diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 2128b09..293f010 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -797,6 +797,7 @@ static int channel_tls_write_packed_cell_method(channel_t *chan, packed_cell_t *packed_cell) { + tor_assert(chan); channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); size_t cell_network_size = get_cell_network_size(chan->wide_circ_ids); int written = 0; diff --git a/src/or/connection.c b/src/or/connection.c index e70b897..86ed2fb 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2240,7 +2240,7 @@ connection_send_socks5_connect(connection_t *conn) } else { /* AF_INET6 */ buf[3] = 4; reqsize += 16; - memcpy(buf + 4, tor_addr_to_in6(&conn->addr), 16); + memcpy(buf + 4, tor_addr_to_in6_addr8(&conn->addr), 16); memcpy(buf + 20, &port, 2); } diff --git a/src/or/geoip.c b/src/or/geoip.c index b563db0..24ec9b7 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -80,9 +80,9 @@ geoip_add_entry(const tor_addr_t *low, const tor_addr_t *high, intptr_t idx; void *idxplus1_; - if (tor_addr_family(low) != tor_addr_family(high)) + IF_BUG_ONCE(tor_addr_family(low) != tor_addr_family(high)) return; - if (tor_addr_compare(high, low, CMP_EXACT) < 0) + IF_BUG_ONCE(tor_addr_compare(high, low, CMP_EXACT) < 0) return; idxplus1_ = strmap_get_lc(country_idxplus1_by_lc_code, country); @@ -110,8 +110,8 @@ geoip_add_entry(const tor_addr_t *low, const tor_addr_t *high, smartlist_add(geoip_ipv4_entries, ent); } else if (tor_addr_family(low) == AF_INET6) { geoip_ipv6_entry_t *ent = tor_malloc_zero(sizeof(geoip_ipv6_entry_t)); - ent->ip_low = *tor_addr_to_in6(low); - ent->ip_high = *tor_addr_to_in6(high); + ent->ip_low = *tor_addr_to_in6_assert(low); + ent->ip_high = *tor_addr_to_in6_assert(high); ent->country = idx; smartlist_add(geoip_ipv6_entries, ent); } diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index 2f5e50f..ec03ced 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -28,6 +28,9 @@ int a_tangled_web(int x) NOINLINE; int we_weave(int x) NOINLINE; static void abort_handler(int s) NORETURN; +#if GCC_VERSION >= 601 +DISABLE_GCC_WARNING(null-dereference) +#endif int crash(int x) { @@ -47,6 +50,9 @@ crash(int x) crashtype *= x; return crashtype; } +#if GCC_VERSION >= 601 +ENABLE_GCC_WARNING(null-dereference) +#endif int oh_what(int x)

1 0

[tor/master] Add -Wunused-const-variable=2 on GCC >=6.1
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit 2ff20c93a5ec753a0c46ca5ecd991b8e2020f7d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 12:28:55 2016 -0400 Add -Wunused-const-variable=2 on GCC >=6.1 This caused a trivial warning in curve25519-donna-64bit.h, which had two unused constants. I commented them out. --- configure.ac | 1 + src/ext/ed25519/donna/curve25519-donna-64bit.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d9149e2..f66d798 100644 --- a/configure.ac +++ b/configure.ac @@ -1778,6 +1778,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ CFLAGS="$CFLAGS -Wignored-attributes -Wshift-negative-value -Wshift-overflow=2" CFLAGS="$CFLAGS -Wnull-dereference" CFLAGS="$CFLAGS -Wduplicated-cond" + CFLAGS="$CFLAGS -Wunused-const-variable=2" fi if test "x$have_shorten64_flag" = "xyes"; then diff --git a/src/ext/ed25519/donna/curve25519-donna-64bit.h b/src/ext/ed25519/donna/curve25519-donna-64bit.h index 2941d1b..50c9916 100644 --- a/src/ext/ed25519/donna/curve25519-donna-64bit.h +++ b/src/ext/ed25519/donna/curve25519-donna-64bit.h @@ -8,9 +8,9 @@ typedef uint64_t bignum25519[5]; -static const uint64_t reduce_mask_40 = ((uint64_t)1 << 40) - 1; +//static const uint64_t reduce_mask_40 = ((uint64_t)1 << 40) - 1; static const uint64_t reduce_mask_51 = ((uint64_t)1 << 51) - 1; -static const uint64_t reduce_mask_56 = ((uint64_t)1 << 56) - 1; +//static const uint64_t reduce_mask_56 = ((uint64_t)1 << 56) - 1; /* out = in */ DONNA_INLINE static void

1 0

[tor/master] Merge remote-tracking branch 'public/bug19203_027' into HEAD
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit b14c1f40826d9e2383707036b6e524f6756aa5d5 Merge: 4f8086f bdc59e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 11 10:11:44 2016 -0400 Merge remote-tracking branch 'public/bug19203_027' into HEAD changes/bug19203 | 4 ++++ src/or/nodelist.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Set our autoconf-breaking options last, not before we check for others
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit 15533c88978a33a7f3c9eda8dbf96463bb6f7dc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 16:13:41 2016 -0400 Set our autoconf-breaking options last, not before we check for others --- configure.ac | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index f80cb47..5bd35e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1671,15 +1671,6 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then CFLAGS="$CFLAGS -Wno-system-headers" ;; esac - - CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith" - CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings" - CFLAGS="$CFLAGS -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2" - CFLAGS="$CFLAGS -Wwrite-strings -Wmissing-declarations" - CFLAGS="$CFLAGS -Wnested-externs -Wbad-function-cast -Wswitch-enum" - CFLAGS="$CFLAGS -Waggregate-return -Wpacked -Wunused" - CFLAGS="$CFLAGS -Wunused-parameter" - # GCC4.3 users once report trouble with -Wstrict-overflow=5. GCC5 users # have it work better. # CFLAGS="$CFLAGS -Wstrict-overflow=1" @@ -1705,7 +1696,6 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then -Wmissing-noreturn -Wnormalized=id -Wnull-dereference - -Wold-style-definition -Woverlength-strings -Woverride-init -Wshift-count-negative @@ -1727,6 +1717,17 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then -Wvariadic-macros ], [ TOR_CHECK_CFLAGS([warning_flag]) ]) + CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith" + CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings" + CFLAGS="$CFLAGS -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2" + CFLAGS="$CFLAGS -Wwrite-strings" + CFLAGS="$CFLAGS -Wnested-externs -Wbad-function-cast -Wswitch-enum" + CFLAGS="$CFLAGS -Waggregate-return -Wpacked -Wunused" + CFLAGS="$CFLAGS -Wunused-parameter " + # These interfere with building main() { return 0; }, which autoconf + # likes to use as its default program. + CFLAGS="$CFLAGS -Wold-style-definition -Wmissing-declarations" + if test "$tor_cv_cflags__Wnull_dereference" = "yes"; then AC_DEFINE([HAVE_CFLAG_WNULL_DEREFERENCE], 1, [True if we have -Wnull-dereference]) fi

1 0

[tor/master] Merge remote-tracking branch 'public/bug19203_027' into maint-0.2.8
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit ada5668c5e2c32e7419091221627bff8b4d254fe Merge: 6eeedc0 bdc59e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 11 10:16:00 2016 -0400 Merge remote-tracking branch 'public/bug19203_027' into maint-0.2.8 changes/bug19203 | 4 ++++ src/or/nodelist.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Add the -Wextra-semi warning from clang, and fix the cases where it triggers
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit 80f1a2cbbdd0abd509711a5069f31855df5bcd79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 2 09:09:37 2016 -0400 Add the -Wextra-semi warning from clang, and fix the cases where it triggers --- configure.ac | 1 + src/common/sandbox.c | 2 +- src/common/util_process.c | 4 ++-- src/or/channel.c | 4 ++-- src/or/circuitmux.c | 2 +- src/or/dircollate.c | 4 ++-- src/or/geoip.c | 4 ++-- src/or/keypin.c | 8 ++++---- src/or/microdesc.c | 2 +- src/or/nodelist.c | 2 +- src/or/rephist.c | 2 +- src/test/test_handles.c | 4 ++-- 12 files changed, 20 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 5a5ba81..4865ca4 100644 --- a/configure.ac +++ b/configure.ac @@ -1745,6 +1745,7 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then -Wexplicit-ownership-type -Wextern-initializer -Wextra + -Wextra-semi -Wextra-tokens -Wflexible-array-extensions -Wfloat-conversion diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 70c5bbd..4e2c5cd 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1443,7 +1443,7 @@ static HT_HEAD(getaddrinfo_cache, cached_getaddrinfo_item_t) HT_PROTOTYPE(getaddrinfo_cache, cached_getaddrinfo_item_t, node, cached_getaddrinfo_item_hash, - cached_getaddrinfo_items_eq); + cached_getaddrinfo_items_eq) HT_GENERATE2(getaddrinfo_cache, cached_getaddrinfo_item_t, node, cached_getaddrinfo_item_hash, cached_getaddrinfo_items_eq, diff --git a/src/common/util_process.c b/src/common/util_process.c index 848b238..abda637 100644 --- a/src/common/util_process.c +++ b/src/common/util_process.c @@ -61,9 +61,9 @@ process_map_entries_eq_(const waitpid_callback_t *a, static HT_HEAD(process_map, waitpid_callback_t) process_map = HT_INITIALIZER(); HT_PROTOTYPE(process_map, waitpid_callback_t, node, process_map_entry_hash_, - process_map_entries_eq_); + process_map_entries_eq_) HT_GENERATE2(process_map, waitpid_callback_t, node, process_map_entry_hash_, - process_map_entries_eq_, 0.6, tor_reallocarray_, tor_free_); + process_map_entries_eq_, 0.6, tor_reallocarray_, tor_free_) /** * Begin monitoring the child pid pid to see if we get a SIGCHLD for diff --git a/src/or/channel.c b/src/or/channel.c index 3b81839..78a2fb9 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -145,9 +145,9 @@ channel_idmap_eq(const channel_idmap_entry_t *a, } HT_PROTOTYPE(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, - channel_idmap_eq); + channel_idmap_eq) HT_GENERATE2(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, - channel_idmap_eq, 0.5, tor_reallocarray_, tor_free_); + channel_idmap_eq, 0.5, tor_reallocarray_, tor_free_) static cell_queue_entry_t * cell_queue_entry_dup(cell_queue_entry_t *q); #if 0 diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index cc1c4cd..038904e 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -362,7 +362,7 @@ HT_HEAD(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t); /* Emit a bunch of hash table stuff */ HT_PROTOTYPE(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t, node, - chanid_circid_entry_hash, chanid_circid_entries_eq); + chanid_circid_entry_hash, chanid_circid_entries_eq) HT_GENERATE2(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t, node, chanid_circid_entry_hash, chanid_circid_entries_eq, 0.6, tor_reallocarray_, tor_free_) diff --git a/src/or/dircollate.c b/src/or/dircollate.c index 3f9d78f..756011b 100644 --- a/src/or/dircollate.c +++ b/src/or/dircollate.c @@ -67,9 +67,9 @@ ddmap_entry_set_digests(ddmap_entry_t *ent, } HT_PROTOTYPE(double_digest_map, ddmap_entry_s, node, ddmap_entry_hash, - ddmap_entry_eq); + ddmap_entry_eq) HT_GENERATE2(double_digest_map, ddmap_entry_s, node, ddmap_entry_hash, - ddmap_entry_eq, 0.6, tor_reallocarray, tor_free_); + ddmap_entry_eq, 0.6, tor_reallocarray, tor_free_) /** Helper: add a single vote_routerstatus_t vrs to the collator * dc, indexing it by its RSA key digest, and by the 2-tuple of diff --git a/src/or/geoip.c b/src/or/geoip.c index 24ec9b7..8740524 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -504,7 +504,7 @@ clientmap_entries_eq(const clientmap_entry_t *a, const clientmap_entry_t *b) } HT_PROTOTYPE(clientmap, clientmap_entry_t, node, clientmap_entry_hash, - clientmap_entries_eq); + clientmap_entries_eq) HT_GENERATE2(clientmap, clientmap_entry_t, node, clientmap_entry_hash, clientmap_entries_eq, 0.6, tor_reallocarray_, tor_free_) @@ -718,7 +718,7 @@ dirreq_map_ent_hash(const dirreq_map_entry_t *entry) } HT_PROTOTYPE(dirreqmap, dirreq_map_entry_t, node, dirreq_map_ent_hash, - dirreq_map_ent_eq); + dirreq_map_ent_eq) HT_GENERATE2(dirreqmap, dirreq_map_entry_t, node, dirreq_map_ent_hash, dirreq_map_ent_eq, 0.6, tor_reallocarray_, tor_free_) diff --git a/src/or/keypin.c b/src/or/keypin.c index 1f82ecc..749bc61 100644 --- a/src/or/keypin.c +++ b/src/or/keypin.c @@ -93,14 +93,14 @@ return (unsigned) siphash24g(a->ed25519_key, sizeof(a->ed25519_key)); } HT_PROTOTYPE(rsamap, keypin_ent_st, rsamap_node, keypin_ent_hash_rsa, - keypin_ents_eq_rsa); + keypin_ents_eq_rsa) HT_GENERATE2(rsamap, keypin_ent_st, rsamap_node, keypin_ent_hash_rsa, - keypin_ents_eq_rsa, 0.6, tor_reallocarray, tor_free_); + keypin_ents_eq_rsa, 0.6, tor_reallocarray, tor_free_) HT_PROTOTYPE(edmap, keypin_ent_st, edmap_node, keypin_ent_hash_ed, - keypin_ents_eq_ed); + keypin_ents_eq_ed) HT_GENERATE2(edmap, keypin_ent_st, edmap_node, keypin_ent_hash_ed, - keypin_ents_eq_ed, 0.6, tor_reallocarray, tor_free_); + keypin_ents_eq_ed, 0.6, tor_reallocarray, tor_free_) /** * Check whether we already have an entry in the key pinning table for a diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 5b5c29a..d317f41 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -69,7 +69,7 @@ microdesc_eq_(microdesc_t *a, microdesc_t *b) } HT_PROTOTYPE(microdesc_map, microdesc_t, node, - microdesc_hash_, microdesc_eq_); + microdesc_hash_, microdesc_eq_) HT_GENERATE2(microdesc_map, microdesc_t, node, microdesc_hash_, microdesc_eq_, 0.6, tor_reallocarray_, tor_free_) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 89b5355..a49bf03 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -77,7 +77,7 @@ node_id_eq(const node_t *node1, const node_t *node2) return tor_memeq(node1->identity, node2->identity, DIGEST_LEN); } -HT_PROTOTYPE(nodelist_map, node_t, ht_ent, node_id_hash, node_id_eq); +HT_PROTOTYPE(nodelist_map, node_t, ht_ent, node_id_hash, node_id_eq) HT_GENERATE2(nodelist_map, node_t, ht_ent, node_id_hash, node_id_eq, 0.6, tor_reallocarray_, tor_free_) diff --git a/src/or/rephist.c b/src/or/rephist.c index 50e8bf5..226739c 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2738,7 +2738,7 @@ bidi_map_ent_hash(const bidi_map_entry_t *entry) } HT_PROTOTYPE(bidimap, bidi_map_entry_t, node, bidi_map_ent_hash, - bidi_map_ent_eq); + bidi_map_ent_eq) HT_GENERATE2(bidimap, bidi_map_entry_t, node, bidi_map_ent_hash, bidi_map_ent_eq, 0.6, tor_reallocarray_, tor_free_) diff --git a/src/test/test_handles.c b/src/test/test_handles.c index 8aaae13..536a478 100644 --- a/src/test/test_handles.c +++ b/src/test/test_handles.c @@ -12,8 +12,8 @@ typedef struct demo_t { int val; } demo_t; -HANDLE_DECL(demo, demo_t, static); -HANDLE_IMPL(demo, demo_t, static); +HANDLE_DECL(demo, demo_t, static) +HANDLE_IMPL(demo, demo_t, static) static demo_t * demo_new(int val)

1 0

[tor/master] Add all the clang-only warnings that do not trigger now
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit 26e979b342c730384d1a3a8baca52000d2cad4f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 16:20:17 2016 -0400 Add all the clang-only warnings that do not trigger now --- configure.ac | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/configure.ac b/configure.ac index 5bd35e2..5a5ba81 100644 --- a/configure.ac +++ b/configure.ac @@ -1681,40 +1681,221 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then m4_foreach_w([warning_flag], [ -Waddress + -Waddress-of-array-temporary + -Waddress-of-temporary + -Wambiguous-macro + -Wanonymous-pack-parens + -Warc + -Warc-abi + -Warc-bridge-casts-disallowed-in-nonarc + -Warc-maybe-repeated-use-of-weak + -Warc-performSelector-leaks + -Warc-repeated-use-of-weak -Warray-bounds + -Warray-bounds-pointer-arithmetic + -Wasm + -Wasm-operand-widths + -Watomic-properties + -Watomic-property-with-user-defined-accessor + -Wauto-import + -Wauto-storage-class + -Wauto-var-id + -Wavailability + -Wbackslash-newline-escape + -Wbad-array-new-length + -Wbind-to-temporary-copy + -Wbitfield-constant-conversion + -Wbool-conversion + -Wbool-conversion + -Wbool-conversions + -Wbuiltin-requires-header + -Wc11-extensions -Wc99-c11-compat + -Wchar-align + -Wcompare-distinct-pointer-types + -Wcomplex-component-init + -Wconditional-type-mismatch + -Wconfig-macros + -Wconstant-conversion + -Wconstant-logical-operand + -Wconstexpr-not-const + -Wcustom-atomic-properties + -Wdangling-field + -Wdangling-initializer-list -Wdate-time + -Wdelegating-ctor-cycles + -Wdeprecated-implementations + -Wdeprecated-register + -Wdirect-ivar-access + -Wdiscard-qual + -Wdistributed-object-modifiers + -Wdivision-by-zero + -Wdollar-in-identifier-extension -Wdouble-promotion + -Wduplicate-decl-specifier + -Wduplicate-enum + -Wduplicate-method-arg + -Wduplicate-method-match -Wduplicated-cond + -Wdynamic-class-memaccess + -Wembedded-directive + -Wempty-translation-unit + -Wenum-conversion + -Wexit-time-destructors + -Wexplicit-ownership-type + -Wextern-initializer -Wextra + -Wextra-tokens + -Wflexible-array-extensions -Wfloat-conversion + -Wformat-non-iso + -Wfour-char-constants + -Wgcc-compat + -Wglobal-constructors + -Wgnu-array-member-paren-init + -Wgnu-designator + -Wgnu-static-float-init + -Wgnu-static-float-init + -Wheader-guard + -Wheader-hygiene + -Widiomatic-parentheses -Wignored-attributes + -Wimplicit-atomic-properties + -Wimplicit-conversion-floating-point-to-bool + -Wimplicit-exception-spec-mismatch + -Wimplicit-fallthrough + -Wimplicit-fallthrough-per-function + -Wimplicit-retain-self + -Wimport-preprocessor-directive-pedantic + -Wincompatible-library-redeclaration + -Wincompatible-pointer-types-discards-qualifiers + -Wincomplete-implementation + -Wincomplete-module + -Wincomplete-umbrella -Winit-self + -Wint-conversions + -Wint-to-void-pointer-cast + -Winteger-overflow + -Winvalid-constexpr + -Winvalid-iboutlet + -Winvalid-noreturn + -Winvalid-pp-token + -Winvalid-source-encoding + -Winvalid-token-paste + -Wknr-promoted-parameter + -Wlanguage-extension-token + -Wlarge-by-value-copy + -Wliteral-conversion + -Wliteral-range + -Wlocal-type-template-args -Wlogical-op + -Wloop-analysis + -Wmain-return-type + -Wmalformed-warning-check + -Wmethod-signatures + -Wmicrosoft + -Wmicrosoft-exists + -Wmismatched-parameter-types + -Wmismatched-return-types -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-noreturn + -Wmissing-selector-name + -Wmissing-sysroot + -Wmodule-conflict + -Wnested-anon-types + -Wnewline-eof + -Wnon-literal-null-conversion + -Wnon-pod-varargs + -Wnonportable-cfstrings -Wnormalized=id + -Wnull-arithmetic + -Wnull-character + -Wnull-conversion + -Wnull-conversion -Wnull-dereference + -Wout-of-line-declaration + -Wover-aligned -Woverlength-strings -Woverride-init + -Woverriding-method-mismatch + -Wpointer-type-mismatch + -Wpredefined-identifier-outside-function + -Wprotocol-property-synthesis-ambiguity + -Wreadonly-iboutlet-property + -Wreadonly-setter-attrs + -Wreceiver-expr + -Wreceiver-forward-class + -Wreceiver-is-weak + -Wreinterpret-base-class + -Wrequires-super-attribute + -Wreserved-user-defined-literal + -Wreturn-stack-address + -Wsection + -Wselector-type-mismatch + -Wsentinel + -Wserialized-diagnostics -Wshift-count-negative -Wshift-count-overflow -Wshift-negative-value -Wshift-overflow=2 + -Wshift-sign-overflow + -Wshorten-64-to-32 -Wshorten-64-to-32 -Wsizeof-array-argument + -Wsource-uses-openmp + -Wstatic-float-init + -Wstatic-in-inline + -Wstatic-local-in-inline -Wstrict-overflow=2 + -Wstring-compare + -Wstrlcpy-strlcat-size + -Wstrncat-size -Wsuggest-attribute=format -Wsuggest-attribute=noreturn + -Wsuper-class-method-mismatch -Wswitch-bool -Wsync-nand + -Wtautological-constant-out-of-range-compare + -Wtentative-definition-incomplete-type + -Wthread-safety + -Wthread-safety-analysis + -Wthread-safety-attributes + -Wthread-safety-beta + -Wthread-safety-precise -Wtrampolines + -Wtype-safety + -Wtypedef-redefinition + -Wtypename-missing + -Wundefined-inline + -Wundefined-internal + -Wundefined-reinterpret-cast + -Wunicode + -Wunicode-whitespace + -Wunknown-warning-option + -Wunnamed-type-template-args + -Wunneeded-member-function + -Wunsequenced + -Wunsupported-visibility -Wunused-but-set-parameter -Wunused-but-set-variable + -Wunused-command-line-argument -Wunused-const-variable=2 + -Wunused-exception-parameter -Wunused-local-typedefs + -Wunused-member-function + -Wunused-sanitize-argument + -Wunused-volatile-lvalue + -Wuser-defined-literals -Wvariadic-macros + -Wvector-conversion + -Wvector-conversions + -Wvexing-parse + -Wvisibility + -Wvla-extension + -Wvla-extension + -Wzero-length-array + -Wzero-length-array ], [ TOR_CHECK_CFLAGS([warning_flag]) ]) CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith"

1 0

[tor/master] Enable -Woverlength-strings for GCC>=4.6 on MOST of the code.
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit 4caed2424a449712c8ac267d521563d31536aa6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 14:13:33 2016 -0400 Enable -Woverlength-strings for GCC>=4.6 on MOST of the code. IMO it's fine for us to make exceptions to this rule in the unit tests, but not in the code at large. --- configure.ac | 1 + src/test/test_dir_handle_get.c | 8 ++++++++ src/test/test_helpers.c | 8 ++++++++ src/test/test_microdesc.c | 8 ++++++++ 4 files changed, 25 insertions(+) diff --git a/configure.ac b/configure.ac index 38c922b..f21d9de 100644 --- a/configure.ac +++ b/configure.ac @@ -1757,6 +1757,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ # and these should be just fine in gcc 4.6 CFLAGS="$CFLAGS -Wmissing-format-attribute -Wsuggest-attribute=noreturn -Wsync-nand -Wtrampolines -Wunused-but-set-parameter -Wunused-but-set-variable -Wvariadic-macros" CFLAGS="$CFLAGS -Wdouble-promotion" + CFLAGS="$CFLAGS -Woverlength-strings" fi if test "x$have_gcc47" = "xyes"; then diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 1416b38..2df705f 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -38,7 +38,15 @@ #include <dirent.h> #endif +#if GCC_VERSION >= 406 +DISABLE_GCC_WARNING(overlength-strings) +/* We allow huge string constants in the unit tests, but not in the code + * at large. */ +#endif #include "vote_descriptors.inc" +#if GCC_VERSION >= 406 +ENABLE_GCC_WARNING(overlength-strings) +#endif #define NS_MODULE dir_handle_get diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index c6daaf2..bf0365a 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -16,7 +16,15 @@ #include "test.h" #include "test_helpers.h" +#if GCC_VERSION >= 406 +DISABLE_GCC_WARNING(overlength-strings) +/* We allow huge string constants in the unit tests, but not in the code + * at large. */ +#endif #include "test_descriptors.inc" +#if GCC_VERSION >= 406 +ENABLE_GCC_WARNING(overlength-strings) +#endif /* Return a statically allocated string representing yesterday's date * in ISO format. We use it so that state file items are not found to diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 581f58b..28c4f07 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -490,6 +490,11 @@ test_md_generate(void *arg) routerinfo_free(ri); } +#if GCC_VERSION >= 406 +DISABLE_GCC_WARNING(overlength-strings) +/* We allow huge string constants in the unit tests, but not in the code + * at large. */ +#endif /* Taken at random from my ~/.tor/cached-microdescs file and then * hand-munged */ static const char MD_PARSE_TEST_DATA[] = @@ -645,6 +650,9 @@ static const char MD_PARSE_TEST_DATA[] = "id rsa1024 2A8wYpHxnkKJ92orocvIQBzeHlE\n" "p6 allow 80\n" ; +#if GCC_VERSION >= 406 +ENABLE_GCC_WARNING(overlength-strings) +#endif /** More tests for parsing different kinds of microdescriptors, and getting * invalid digests trackd from them. */

1 0

[tor/master] Resolve some warnings from OSX clang.
by nickm＠torproject.org 11 Jun '16

11 Jun '16

commit c3adbf755b0bb6f77488a268dbc4f2bdc0e59b01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 16:35:00 2016 -0400 Resolve some warnings from OSX clang. --- acinclude.m4 | 2 +- src/or/channeltls.c | 2 +- src/test/test_channel.c | 2 +- src/test/test_util.c | 9 ++++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 4b9f095..ab12317 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -75,7 +75,7 @@ dnl 1:flags dnl 2:also try to link (yes: non-empty string) dnl will set yes or no in $tor_can_link_$1 (as modified by AS_VAR_PUSHDEF) AC_DEFUN([TOR_CHECK_CFLAGS], [ - TOR_TRY_COMPILE_WITH_CFLAGS($1, $2, CFLAGS="$CFLAGS $1", /bin/true) + TOR_TRY_COMPILE_WITH_CFLAGS($1, $2, CFLAGS="$CFLAGS $1", true) ]) dnl 1:flags diff --git a/src/or/channeltls.c b/src/or/channeltls.c index a7de986..5833b2a 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -445,7 +445,7 @@ channel_tls_free_method(channel_t *chan) static double channel_tls_get_overhead_estimate_method(channel_t *chan) { - double overhead = 1.0f; + double overhead = 1.0; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); tor_assert(tlschan); diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 79bc5ac..f37e718 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -1584,7 +1584,7 @@ test_channel_queue_size(void *arg) /* One cell, times an overhead factor of 1.0 */ tt_u64_op(ch->bytes_queued_for_xmit, ==, 512); /* Try a different overhead factor */ - test_overhead_estimate = 0.5f; + test_overhead_estimate = 0.5; /* This one should be ignored since it's below 1.0 */ channel_update_xmit_queue_size(ch); tt_u64_op(ch->bytes_queued_for_xmit, ==, 512); diff --git a/src/test/test_util.c b/src/test/test_util.c index 05c7d60..a09bb21 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -30,6 +30,9 @@ #include <ctype.h> #include <float.h> +#define INFINITY_DBL ((double)INFINITY) +#define NAN_DBL ((double)NAN) + /* XXXX this is a minimal wrapper to make the unit tests compile with the * changed tor_timegm interface. */ static time_t @@ -4392,7 +4395,7 @@ test_util_clamp_double_to_int64(void *arg) { (void)arg; - tt_i64_op(INT64_MIN, ==, clamp_double_to_int64(-INFINITY)); + tt_i64_op(INT64_MIN, ==, clamp_double_to_int64(-INFINITY_DBL)); tt_i64_op(INT64_MIN, ==, clamp_double_to_int64(-1.0 * pow(2.0, 64.0) - 1.0)); tt_i64_op(INT64_MIN, ==, @@ -4405,7 +4408,7 @@ test_util_clamp_double_to_int64(void *arg) tt_i64_op(0, ==, clamp_double_to_int64(-0.9)); tt_i64_op(0, ==, clamp_double_to_int64(-0.1)); tt_i64_op(0, ==, clamp_double_to_int64(0.0)); - tt_i64_op(0, ==, clamp_double_to_int64(NAN)); + tt_i64_op(0, ==, clamp_double_to_int64(NAN_DBL)); tt_i64_op(0, ==, clamp_double_to_int64(0.1)); tt_i64_op(0, ==, clamp_double_to_int64(0.9)); tt_i64_op(1, ==, clamp_double_to_int64(1.0)); @@ -4417,7 +4420,7 @@ test_util_clamp_double_to_int64(void *arg) clamp_double_to_int64(pow(2.0, 63.0))); tt_i64_op(INT64_MAX, ==, clamp_double_to_int64(pow(2.0, 64.0))); - tt_i64_op(INT64_MAX, ==, clamp_double_to_int64(INFINITY)); + tt_i64_op(INT64_MAX, ==, clamp_double_to_int64(INFINITY_DBL)); done: ;

1 0