tor-commits September 2014

tor-commits@lists.torproject.org

22 participants
980 discussions

[tor/master] Make iter for DECLARE_TYPED_DIGESTMAP_FNS be a pointer.
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit a14c6cb70f56c24cc76023366f8ae56900f72296 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 15:40:04 2014 -0400 Make iter for DECLARE_TYPED_DIGESTMAP_FNS be a pointer. This fixes a clangalyzer warning, and makes our C slightly better C. --- src/common/container.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/container.h b/src/common/container.h index 9fb4cf3..26ac851 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -473,7 +473,7 @@ void* strmap_remove_lc(strmap_t *map, const char *key); #define DECLARE_TYPED_DIGESTMAP_FNS(prefix, maptype, valtype) \ typedef struct maptype maptype; \ - typedef struct prefix##iter_t prefix##iter_t; \ + typedef struct prefix##iter_t *prefix##iter_t; \ ATTR_UNUSED static INLINE maptype* \ prefix##new(void) \ { \

1 0

[tor/master] Fix more (void*)11 warnings in the tests
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit bce32e0a356bc9d0b95a34301c6f3cc54622c4bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 15:40:47 2014 -0400 Fix more (void*)11 warnings in the tests --- src/test/test_circuitlist.c | 12 ++++++++--- src/test/test_containers.c | 48 ++++++++++++++++++++++++++++--------------- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index b19edd1..97c6b98 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -79,9 +79,9 @@ test_clist_maps(void *arg) memset(&cam, 0, sizeof(cam)); memset(&cdm, 0, sizeof(cdm)); - ch1->cmux = (void*)0x1001; - ch2->cmux = (void*)0x1002; - ch3->cmux = (void*)0x1003; + ch1->cmux = tor_malloc(1); + ch2->cmux = tor_malloc(1); + ch3->cmux = tor_malloc(1); or_c1 = or_circuit_new(100, ch2); tt_assert(or_c1); @@ -156,6 +156,12 @@ test_clist_maps(void *arg) circuit_free(TO_CIRCUIT(or_c1)); if (or_c2) circuit_free(TO_CIRCUIT(or_c2)); + if (ch1) + tor_free(ch1->cmux); + if (ch2) + tor_free(ch2->cmux); + if (ch3) + tor_free(ch3->cmux); tor_free(ch1); tor_free(ch2); tor_free(ch3); diff --git a/src/test/test_containers.c b/src/test/test_containers.c index ca04f9b..a9f5e72 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -40,38 +40,54 @@ static void test_container_smartlist_basic(void) { smartlist_t *sl; + char *v0 = tor_strdup("v0"); + char *v1 = tor_strdup("v1"); + char *v2 = tor_strdup("v2"); + char *v3 = tor_strdup("v3"); + char *v4 = tor_strdup("v4"); + char *v22 = tor_strdup("v22"); + char *v99 = tor_strdup("v99"); + char *v555 = tor_strdup("v555"); /* XXXX test sort_digests, uniq_strings, uniq_digests */ /* Test smartlist add, del_keeporder, insert, get. */ sl = smartlist_new(); - smartlist_add(sl, (void*)1); - smartlist_add(sl, (void*)2); - smartlist_add(sl, (void*)3); - smartlist_add(sl, (void*)4); + smartlist_add(sl, v1); + smartlist_add(sl, v2); + smartlist_add(sl, v3); + smartlist_add(sl, v4); smartlist_del_keeporder(sl, 1); - smartlist_insert(sl, 1, (void*)22); - smartlist_insert(sl, 0, (void*)0); - smartlist_insert(sl, 5, (void*)555); - test_eq_ptr((void*)0, smartlist_get(sl,0)); - test_eq_ptr((void*)1, smartlist_get(sl,1)); - test_eq_ptr((void*)22, smartlist_get(sl,2)); - test_eq_ptr((void*)3, smartlist_get(sl,3)); - test_eq_ptr((void*)4, smartlist_get(sl,4)); - test_eq_ptr((void*)555, smartlist_get(sl,5)); + smartlist_insert(sl, 1, v22); + smartlist_insert(sl, 0, v0); + smartlist_insert(sl, 5, v555); + test_eq_ptr(v0, smartlist_get(sl,0)); + test_eq_ptr(v1, smartlist_get(sl,1)); + test_eq_ptr(v22, smartlist_get(sl,2)); + test_eq_ptr(v3, smartlist_get(sl,3)); + test_eq_ptr(v4, smartlist_get(sl,4)); + test_eq_ptr(v555, smartlist_get(sl,5)); /* Try deleting in the middle. */ smartlist_del(sl, 1); - test_eq_ptr((void*)555, smartlist_get(sl, 1)); + test_eq_ptr(v555, smartlist_get(sl, 1)); /* Try deleting at the end. */ smartlist_del(sl, 4); test_eq(4, smartlist_len(sl)); /* test isin. */ - test_assert(smartlist_contains(sl, (void*)3)); - test_assert(!smartlist_contains(sl, (void*)99)); + test_assert(smartlist_contains(sl, v3)); + test_assert(!smartlist_contains(sl, v99)); done: smartlist_free(sl); + tor_free(v0); + tor_free(v1); + tor_free(v2); + tor_free(v3); + tor_free(v4); + tor_free(v22); + tor_free(v99); + tor_free(v555); } /** Run unit tests for smartlist-of-strings functionality. */

1 0

[tor/master] Use real pointers in unit tests, not (void*)101 etc
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 44f0dfa53bd0eea816fd2785088b4295a91112e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 13:56:54 2014 -0400 Use real pointers in unit tests, not (void*)101 etc The clangalyzer hates (void*)101 etc --- src/test/test_containers.c | 90 +++++++++++++++++++++++++++++--------------- src/test/test_routerset.c | 11 +----- 2 files changed, 62 insertions(+), 39 deletions(-) diff --git a/src/test/test_containers.c b/src/test/test_containers.c index 067c4c1..ca04f9b 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -717,36 +717,44 @@ test_container_strmap(void) void *v; char *visited = NULL; smartlist_t *found_keys = NULL; + char *v1 = tor_strdup("v1"); + char *v99 = tor_strdup("v99"); + char *v100 = tor_strdup("v100"); + char *v101 = tor_strdup("v101"); + char *v102 = tor_strdup("v102"); + char *v103 = tor_strdup("v103"); + char *v104 = tor_strdup("v104"); + char *v105 = tor_strdup("v105"); map = strmap_new(); test_assert(map); test_eq(strmap_size(map), 0); test_assert(strmap_isempty(map)); - v = strmap_set(map, "K1", (void*)99); + v = strmap_set(map, "K1", v99); test_eq_ptr(v, NULL); test_assert(!strmap_isempty(map)); - v = strmap_set(map, "K2", (void*)101); + v = strmap_set(map, "K2", v101); test_eq_ptr(v, NULL); - v = strmap_set(map, "K1", (void*)100); - test_eq_ptr(v, (void*)99); - test_eq_ptr(strmap_get(map,"K1"), (void*)100); - test_eq_ptr(strmap_get(map,"K2"), (void*)101); + v = strmap_set(map, "K1", v100); + test_eq_ptr(v, v99); + test_eq_ptr(strmap_get(map,"K1"), v100); + test_eq_ptr(strmap_get(map,"K2"), v101); test_eq_ptr(strmap_get(map,"K-not-there"), NULL); strmap_assert_ok(map); v = strmap_remove(map,"K2"); strmap_assert_ok(map); - test_eq_ptr(v, (void*)101); + test_eq_ptr(v, v101); test_eq_ptr(strmap_get(map,"K2"), NULL); test_eq_ptr(strmap_remove(map,"K2"), NULL); - strmap_set(map, "K2", (void*)101); - strmap_set(map, "K3", (void*)102); - strmap_set(map, "K4", (void*)103); + strmap_set(map, "K2", v101); + strmap_set(map, "K3", v102); + strmap_set(map, "K4", v103); test_eq(strmap_size(map), 4); strmap_assert_ok(map); - strmap_set(map, "K5", (void*)104); - strmap_set(map, "K6", (void*)105); + strmap_set(map, "K5", v104); + strmap_set(map, "K6", v105); strmap_assert_ok(map); /* Test iterator. */ @@ -766,7 +774,7 @@ test_container_strmap(void) /* Make sure we removed K2, but not the others. */ test_eq_ptr(strmap_get(map, "K2"), NULL); - test_eq_ptr(strmap_get(map, "K5"), (void*)104); + test_eq_ptr(strmap_get(map, "K5"), v104); /* Make sure we visited everyone once */ smartlist_sort_strings(found_keys); visited = smartlist_join_strings(found_keys, ":", 0, NULL); @@ -779,12 +787,12 @@ test_container_strmap(void) /* Now try some lc functions. */ map = strmap_new(); - strmap_set_lc(map,"Ab.C", (void*)1); - test_eq_ptr(strmap_get(map,"ab.c"), (void*)1); + strmap_set_lc(map,"Ab.C", v1); + test_eq_ptr(strmap_get(map,"ab.c"), v1); strmap_assert_ok(map); - test_eq_ptr(strmap_get_lc(map,"AB.C"), (void*)1); + test_eq_ptr(strmap_get_lc(map,"AB.C"), v1); test_eq_ptr(strmap_get(map,"AB.C"), NULL); - test_eq_ptr(strmap_remove_lc(map,"aB.C"), (void*)1); + test_eq_ptr(strmap_remove_lc(map,"aB.C"), v1); strmap_assert_ok(map); test_eq_ptr(strmap_get_lc(map,"AB.C"), NULL); @@ -796,6 +804,14 @@ test_container_strmap(void) smartlist_free(found_keys); } tor_free(visited); + tor_free(v1); + tor_free(v99); + tor_free(v100); + tor_free(v101); + tor_free(v102); + tor_free(v103); + tor_free(v104); + tor_free(v105); } /** Run unit tests for getting the median of a list. */ @@ -881,6 +897,13 @@ test_container_fp_pair_map(void) void *v; fp_pair_map_iter_t *iter; fp_pair_t k; + char *v99 = tor_strdup("99"); + char *v100 = tor_strdup("v100"); + char *v101 = tor_strdup("v101"); + char *v102 = tor_strdup("v102"); + char *v103 = tor_strdup("v103"); + char *v104 = tor_strdup("v104"); + char *v105 = tor_strdup("v105"); map = fp_pair_map_new(); test_assert(map); @@ -900,31 +923,31 @@ test_container_fp_pair_map(void) memset(fp6.first, 0x61, DIGEST_LEN); memset(fp6.second, 0x62, DIGEST_LEN); - v = fp_pair_map_set(map, &fp1, (void*)99); + v = fp_pair_map_set(map, &fp1, v99); tt_ptr_op(v, ==, NULL); test_assert(!fp_pair_map_isempty(map)); - v = fp_pair_map_set(map, &fp2, (void*)101); + v = fp_pair_map_set(map, &fp2, v101); tt_ptr_op(v, ==, NULL); - v = fp_pair_map_set(map, &fp1, (void*)100); - tt_ptr_op(v, ==, (void*)99); - test_eq_ptr(fp_pair_map_get(map, &fp1), (void*)100); - test_eq_ptr(fp_pair_map_get(map, &fp2), (void*)101); + v = fp_pair_map_set(map, &fp1, v100); + tt_ptr_op(v, ==, v99); + test_eq_ptr(fp_pair_map_get(map, &fp1), v100); + test_eq_ptr(fp_pair_map_get(map, &fp2), v101); test_eq_ptr(fp_pair_map_get(map, &fp3), NULL); fp_pair_map_assert_ok(map); v = fp_pair_map_remove(map, &fp2); fp_pair_map_assert_ok(map); - test_eq_ptr(v, (void*)101); + test_eq_ptr(v, v101); test_eq_ptr(fp_pair_map_get(map, &fp2), NULL); test_eq_ptr(fp_pair_map_remove(map, &fp2), NULL); - fp_pair_map_set(map, &fp2, (void*)101); - fp_pair_map_set(map, &fp3, (void*)102); - fp_pair_map_set(map, &fp4, (void*)103); + fp_pair_map_set(map, &fp2, v101); + fp_pair_map_set(map, &fp3, v102); + fp_pair_map_set(map, &fp4, v103); test_eq(fp_pair_map_size(map), 4); fp_pair_map_assert_ok(map); - fp_pair_map_set(map, &fp5, (void*)104); - fp_pair_map_set(map, &fp6, (void*)105); + fp_pair_map_set(map, &fp5, v104); + fp_pair_map_set(map, &fp6, v105); fp_pair_map_assert_ok(map); /* Test iterator. */ @@ -942,7 +965,7 @@ test_container_fp_pair_map(void) /* Make sure we removed fp2, but not the others. */ test_eq_ptr(fp_pair_map_get(map, &fp2), NULL); - test_eq_ptr(fp_pair_map_get(map, &fp5), (void*)104); + test_eq_ptr(fp_pair_map_get(map, &fp5), v104); fp_pair_map_assert_ok(map); /* Clean up after ourselves. */ @@ -952,6 +975,13 @@ test_container_fp_pair_map(void) done: if (map) fp_pair_map_free(map, NULL); + tor_free(v99); + tor_free(v100); + tor_free(v101); + tor_free(v102); + tor_free(v103); + tor_free(v104); + tor_free(v105); } #define CONTAINER_LEGACY(name) \ diff --git a/src/test/test_routerset.c b/src/test/test_routerset.c index 9e5b51e..0ef2c53 100644 --- a/src/test/test_routerset.c +++ b/src/test/test_routerset.c @@ -845,7 +845,8 @@ NS(test_main)(void *arg) NS_DECL(addr_policy_result_t, compare_tor_addr_to_addr_policy, (const tor_addr_t *addr, uint16_t port, const smartlist_t *policy)); -#define MOCK_TOR_ADDR_PTR (tor_addr_t *)0xdeafbead +static tor_addr_t MOCK_TOR_ADDR; +#define MOCK_TOR_ADDR_PTR (&MOCK_TOR_ADDR) static void NS(test_main)(void *arg) @@ -892,8 +893,6 @@ NS(compare_tor_addr_to_addr_policy)(const tor_addr_t *addr, uint16_t port, NS_DECL(addr_policy_result_t, compare_tor_addr_to_addr_policy, (const tor_addr_t *addr, uint16_t port, const smartlist_t *policy)); -#define MOCK_TOR_ADDR_PTR (tor_addr_t *)0xdeafbead - static void NS(test_main)(void *arg) { @@ -940,8 +939,6 @@ NS(compare_tor_addr_to_addr_policy)(const tor_addr_t *addr, uint16_t port, NS_DECL(addr_policy_result_t, compare_tor_addr_to_addr_policy, (const tor_addr_t *addr, uint16_t port, const smartlist_t *policy)); -#define MOCK_TOR_ADDR_PTR (tor_addr_t *)0xdeafbead - static void NS(test_main)(void *arg) { @@ -987,8 +984,6 @@ NS_DECL(addr_policy_result_t, compare_tor_addr_to_addr_policy, (const tor_addr_t *addr, uint16_t port, const smartlist_t *policy)); NS_DECL(int, geoip_get_country_by_addr, (const tor_addr_t *addr)); -#define MOCK_TOR_ADDR_PTR (tor_addr_t *)0xdeafbead - static void NS(test_main)(void *arg) { @@ -1047,8 +1042,6 @@ NS_DECL(addr_policy_result_t, compare_tor_addr_to_addr_policy, (const tor_addr_t *addr, uint16_t port, const smartlist_t *policy)); NS_DECL(int, geoip_get_country_by_addr, (const tor_addr_t *addr)); -#define MOCK_TOR_ADDR_PTR (tor_addr_t *)0xdeafbead - static void NS(test_main)(void *arg) {

1 0

[tor/master] Another clang analyzer complaint wrt HT_GENERATE
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 00ffccd9a6d9b7f484c2e421be33aea3975a2879 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 12:48:34 2014 -0400 Another clang analyzer complaint wrt HT_GENERATE We're calling mallocfn() and reallocfn() in the HT_GENERATE macro with the result of a product. But that makes any sane analyzer worry about overflow. This patch keeps HT_GENERATE having its old semantics, since we aren't the only project using ht.h. Instead, define a HT_GENERATE2 that takes a reallocarrayfn. --- src/common/container.c | 8 ++++---- src/common/sandbox.c | 8 ++++---- src/common/util_process.c | 4 ++-- src/ext/ht.h | 23 +++++++++++++++++++---- src/or/channel.c | 4 ++-- src/or/circuitlist.c | 6 +++--- src/or/circuitmux.c | 6 +++--- src/or/dns.c | 4 ++-- src/or/fp_pair.c | 6 +++--- src/or/geoip.c | 8 ++++---- src/or/microdesc.c | 4 ++-- src/or/nodelist.c | 4 ++-- src/or/policies.c | 4 ++-- src/or/rephist.c | 4 ++-- 14 files changed, 54 insertions(+), 39 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index 7481d31..f7dfc69 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -1052,13 +1052,13 @@ digestmap_entry_hash(const digestmap_entry_t *a) HT_PROTOTYPE(strmap_impl, strmap_entry_t, node, strmap_entry_hash, strmap_entries_eq) -HT_GENERATE(strmap_impl, strmap_entry_t, node, strmap_entry_hash, - strmap_entries_eq, 0.6, malloc, realloc, free) +HT_GENERATE2(strmap_impl, strmap_entry_t, node, strmap_entry_hash, + strmap_entries_eq, 0.6, tor_reallocarray_, tor_free_) HT_PROTOTYPE(digestmap_impl, digestmap_entry_t, node, digestmap_entry_hash, digestmap_entries_eq) -HT_GENERATE(digestmap_impl, digestmap_entry_t, node, digestmap_entry_hash, - digestmap_entries_eq, 0.6, malloc, realloc, free) +HT_GENERATE2(digestmap_impl, digestmap_entry_t, node, digestmap_entry_hash, + digestmap_entries_eq, 0.6, tor_reallocarray_, tor_free_) /** Constructor to create a new empty map from strings to void*'s. */ diff --git a/src/common/sandbox.c b/src/common/sandbox.c index b414e31..c7e4dcd 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1292,10 +1292,10 @@ 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); -HT_GENERATE(getaddrinfo_cache, cached_getaddrinfo_item_t, node, - cached_getaddrinfo_item_hash, - cached_getaddrinfo_items_eq, - 0.6, tor_malloc_, tor_realloc_, tor_free_); +HT_GENERATE2(getaddrinfo_cache, cached_getaddrinfo_item_t, node, + cached_getaddrinfo_item_hash, + cached_getaddrinfo_items_eq, + 0.6, tor_reallocarray_, tor_free_) int sandbox_getaddrinfo(const char *name, const char *servname, diff --git a/src/common/util_process.c b/src/common/util_process.c index d6ef590..a6a2a9d 100644 --- a/src/common/util_process.c +++ b/src/common/util_process.c @@ -62,8 +62,8 @@ 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_); -HT_GENERATE(process_map, waitpid_callback_t, node, process_map_entry_hash_, - process_map_entries_eq_, 0.6, malloc, realloc, free); +HT_GENERATE2(process_map, waitpid_callback_t, node, process_map_entry_hash_, + 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/ext/ht.h b/src/ext/ht.h index 8387107..61e9719 100644 --- a/src/ext/ht.h +++ b/src/ext/ht.h @@ -302,8 +302,8 @@ ht_string_hash(const char *s) } \ } -#define HT_GENERATE(name, type, field, hashfn, eqfn, load, mallocfn, \ - reallocfn, freefn) \ +#define HT_GENERATE2(name, type, field, hashfn, eqfn, load, reallocarrayfn, \ + freefn) \ /* Primes that aren't too far from powers of two. We stop at */ \ /* P=402653189 because P*sizeof(void*) is less than SSIZE_MAX */ \ /* even on a 32-bit platform. */ \ @@ -336,7 +336,7 @@ ht_string_hash(const char *s) new_load_limit = (unsigned)(load*new_len); \ } while (new_load_limit <= size && \ prime_idx < (int)name##_N_PRIMES); \ - if ((new_table = mallocfn(new_len*sizeof(struct type*)))) { \ + if ((new_table = reallocarrayfn(NULL, new_len, sizeof(struct type*)))) { \ unsigned b; \ memset(new_table, 0, new_len*sizeof(struct type*)); \ for (b = 0; b < head->hth_table_length; ++b) { \ @@ -356,7 +356,7 @@ ht_string_hash(const char *s) head->hth_table = new_table; \ } else { \ unsigned b, b2; \ - new_table = reallocfn(head->hth_table, new_len*sizeof(struct type*)); \ + new_table = reallocarrayfn(head->hth_table, new_len, sizeof(struct type*)); \ if (!new_table) return -1; \ memset(new_table + head->hth_table_length, 0, \ (new_len - head->hth_table_length)*sizeof(struct type*)); \ @@ -427,6 +427,21 @@ ht_string_hash(const char *s) return 0; \ } +#define HT_GENERATE(name, type, field, hashfn, eqfn, load, mallocfn, \ + reallocfn, freefn) \ + static void * \ + name##_reallocarray(void *arg, size_t a, size_t b) \ + { \ + if ((b) && (a) > SIZE_MAX / (b)) \ + return NULL; \ + if (arg) \ + return reallocfn((arg),(a)*(b)); \ + else \ + return mallocfn((a)*(b)); \ + } \ + HT_GENERATE2(name, type, field, hashfn, eqfn, load, \ + name##_reallocarray, freefn) + /** Implements an over-optimized "find and insert if absent" block; * not meant for direct usage by typical code, or usage outside the critical * path.*/ diff --git a/src/or/channel.c b/src/or/channel.c index ffd6849..4129839 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -108,8 +108,8 @@ channel_idmap_eq(const channel_idmap_entry_t *a, HT_PROTOTYPE(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, channel_idmap_eq); -HT_GENERATE(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, - channel_idmap_eq, 0.5, tor_malloc, tor_realloc, tor_free_); +HT_GENERATE2(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, + channel_idmap_eq, 0.5, tor_reallocarray_, tor_free_); static cell_queue_entry_t * cell_queue_entry_dup(cell_queue_entry_t *q); static void cell_queue_entry_free(cell_queue_entry_t *q, int handed_off); diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 35c5236..9d72ea1 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -94,9 +94,9 @@ static HT_HEAD(chan_circid_map, chan_circid_circuit_map_t) chan_circid_map = HT_INITIALIZER(); HT_PROTOTYPE(chan_circid_map, chan_circid_circuit_map_t, node, chan_circid_entry_hash_, chan_circid_entries_eq_) -HT_GENERATE(chan_circid_map, chan_circid_circuit_map_t, node, - chan_circid_entry_hash_, chan_circid_entries_eq_, 0.6, - malloc, realloc, free) +HT_GENERATE2(chan_circid_map, chan_circid_circuit_map_t, node, + chan_circid_entry_hash_, chan_circid_entries_eq_, 0.6, + tor_reallocarray_, tor_free_) /** The most recently returned entry from circuit_get_by_circid_chan; * used to improve performance when many cells arrive in a row from the diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index e4571ff..3ca33b0 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -363,9 +363,9 @@ 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); -HT_GENERATE(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t, node, - chanid_circid_entry_hash, chanid_circid_entries_eq, 0.6, - malloc, realloc, free); +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_) /* * Circuitmux alloc/free functions diff --git a/src/or/dns.c b/src/or/dns.c index a9c4318..362b970 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -244,8 +244,8 @@ cached_resolve_hash(cached_resolve_t *a) HT_PROTOTYPE(cache_map, cached_resolve_t, node, cached_resolve_hash, cached_resolves_eq) -HT_GENERATE(cache_map, cached_resolve_t, node, cached_resolve_hash, - cached_resolves_eq, 0.6, malloc, realloc, free) +HT_GENERATE2(cache_map, cached_resolve_t, node, cached_resolve_hash, + cached_resolves_eq, 0.6, tor_reallocarray_, tor_free_) /** Initialize the DNS cache. */ static void diff --git a/src/or/fp_pair.c b/src/or/fp_pair.c index 55e4c89..1be1696 100644 --- a/src/or/fp_pair.c +++ b/src/or/fp_pair.c @@ -42,9 +42,9 @@ fp_pair_map_entry_hash(const fp_pair_map_entry_t *a) HT_PROTOTYPE(fp_pair_map_impl, fp_pair_map_entry_s, node, fp_pair_map_entry_hash, fp_pair_map_entries_eq) -HT_GENERATE(fp_pair_map_impl, fp_pair_map_entry_s, node, - fp_pair_map_entry_hash, fp_pair_map_entries_eq, - 0.6, tor_malloc, tor_realloc, tor_free) +HT_GENERATE2(fp_pair_map_impl, fp_pair_map_entry_s, node, + fp_pair_map_entry_hash, fp_pair_map_entries_eq, + 0.6, tor_reallocarray_, tor_free_) /** Constructor to create a new empty map from fp_pair_t to void * */ diff --git a/src/or/geoip.c b/src/or/geoip.c index 108385e..cdf2797 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -506,8 +506,8 @@ 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); -HT_GENERATE(clientmap, clientmap_entry_t, node, clientmap_entry_hash, - clientmap_entries_eq, 0.6, malloc, realloc, free); +HT_GENERATE2(clientmap, clientmap_entry_t, node, clientmap_entry_hash, + clientmap_entries_eq, 0.6, tor_reallocarray_, tor_free_) /** Free all storage held by ent. */ static void @@ -720,8 +720,8 @@ 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); -HT_GENERATE(dirreqmap, dirreq_map_entry_t, node, dirreq_map_ent_hash, - dirreq_map_ent_eq, 0.6, malloc, realloc, free); +HT_GENERATE2(dirreqmap, dirreq_map_entry_t, node, dirreq_map_ent_hash, + dirreq_map_ent_eq, 0.6, tor_reallocarray_, tor_free_) /** Helper: Put entry into map of directory requests using * type and dirreq_id as key parts. If there is diff --git a/src/or/microdesc.c b/src/or/microdesc.c index fdb549a..ed586f3 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -57,9 +57,9 @@ microdesc_eq_(microdesc_t *a, microdesc_t *b) HT_PROTOTYPE(microdesc_map, microdesc_t, node, microdesc_hash_, microdesc_eq_); -HT_GENERATE(microdesc_map, microdesc_t, node, +HT_GENERATE2(microdesc_map, microdesc_t, node, microdesc_hash_, microdesc_eq_, 0.6, - malloc, realloc, free); + tor_reallocarray_, tor_free_) /** Write the body of md into f, with appropriate annotations. * On success, return the total number of bytes written, and set diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 21e4ec2..d7deac1 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -53,8 +53,8 @@ node_id_eq(const node_t *node1, const node_t *node2) } HT_PROTOTYPE(nodelist_map, node_t, ht_ent, node_id_hash, node_id_eq); -HT_GENERATE(nodelist_map, node_t, ht_ent, node_id_hash, node_id_eq, - 0.6, malloc, realloc, free); +HT_GENERATE2(nodelist_map, node_t, ht_ent, node_id_hash, node_id_eq, + 0.6, tor_reallocarray_, tor_free_) /** The global nodelist. */ static nodelist_t *the_nodelist=NULL; diff --git a/src/or/policies.c b/src/or/policies.c index 4dbb43e..adc286a 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -629,8 +629,8 @@ policy_hash(const policy_map_ent_t *ent) HT_PROTOTYPE(policy_map, policy_map_ent_t, node, policy_hash, policy_eq) -HT_GENERATE(policy_map, policy_map_ent_t, node, policy_hash, - policy_eq, 0.6, malloc, realloc, free) +HT_GENERATE2(policy_map, policy_map_ent_t, node, policy_hash, + policy_eq, 0.6, tor_reallocarray_, tor_free_) /** Given a pointer to an addr_policy_t, return a copy of the pointer to the * "canonical" copy of that addr_policy_t; the canonical copy is a single diff --git a/src/or/rephist.c b/src/or/rephist.c index 2f8ebcb..cd92b0a 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2724,8 +2724,8 @@ 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); -HT_GENERATE(bidimap, bidi_map_entry_t, node, bidi_map_ent_hash, - bidi_map_ent_eq, 0.6, malloc, realloc, free); +HT_GENERATE2(bidimap, bidi_map_entry_t, node, bidi_map_ent_hash, + bidi_map_ent_eq, 0.6, tor_reallocarray_, tor_free_) /* DOCDOC bidi_map_free */ static void

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 475c95f28a70fff665a4b6a608a4d3a61c2c77d9 Merge: b969ee9 efcab43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 12:07:39 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5 changes/bug12878 | 3 +++ changes/ticket13036 | 5 +++++ src/common/address.c | 2 ++ src/or/circuitmux.c | 8 +++++++- src/or/connection.c | 1 + src/or/control.c | 5 +++-- src/or/dirvote.c | 4 ++++ src/or/rephist.c | 2 +- src/or/routerparse.c | 3 ++- 9 files changed, 28 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.5] Fix a number of clang analyzer false-positives
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit efcab439564dcadc5bc14609a9205d73d236e966 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 11:55:53 2014 -0400 Fix a number of clang analyzer false-positives Most of these are in somewhat non-obvious code where it is probably a good idea to initialize variables and add extra assertions anyway. Closes 13036. Patches from "teor". --- changes/ticket13036 | 5 +++++ src/common/address.c | 2 ++ src/or/circuitmux.c | 8 +++++++- src/or/connection.c | 1 + src/or/control.c | 5 +++-- src/or/dirvote.c | 4 ++++ src/or/rephist.c | 2 +- src/or/routerparse.c | 3 ++- 8 files changed, 25 insertions(+), 5 deletions(-) diff --git a/changes/ticket13036 b/changes/ticket13036 new file mode 100644 index 0000000..1b47843 --- /dev/null +++ b/changes/ticket13036 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a large number of false positive warnings from the clang + analyzer static analysis tool. This should make real warnings + easier for clang analyzer to find. Patch from "teor". Closes + ticket 13036. diff --git a/src/common/address.c b/src/common/address.c index 29d4c04..8591f38 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -324,6 +324,8 @@ tor_addr_is_internal_(const tor_addr_t *addr, int for_listening, uint32_t iph4 = 0; uint32_t iph6[4]; sa_family_t v_family; + + tor_assert(addr); v_family = tor_addr_family(addr); if (v_family == AF_INET) { diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 55580d5..e4571ff 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -1092,8 +1092,11 @@ circuitmux_detach_circuit,(circuitmux_t *cmux, circuit_t *circ)) /* * Use this to keep track of whether we found it for n_chan or * p_chan for consistency checking. + * + * The 0 initializer is not a valid cell_direction_t value. + * We assert that it has been replaced with a valid value before it is used. */ - cell_direction_t last_searched_direction; + cell_direction_t last_searched_direction = 0; tor_assert(cmux); tor_assert(cmux->chanid_circid_map); @@ -1123,6 +1126,9 @@ circuitmux_detach_circuit,(circuitmux_t *cmux, circuit_t *circ)) } } + tor_assert(last_searched_direction == CELL_DIRECTION_OUT + || last_searched_direction == CELL_DIRECTION_IN); + /* * If hashent isn't NULL, we have a circuit to detach; don't remove it from * the map until later of circuitmux_make_circuit_inactive() breaks. diff --git a/src/or/connection.c b/src/or/connection.c index 4788bdf..276dca2 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1613,6 +1613,7 @@ connection_connect(connection_t *conn, const char *address, } } + tor_assert(options); if (options->ConstrainedSockets) set_constrained_socket_buffers(s, (int)options->ConstrainedSockSize); diff --git a/src/or/control.c b/src/or/control.c index ec63506..4a6b18d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2639,7 +2639,7 @@ handle_control_attachstream(control_connection_t *conn, uint32_t len, /* Is this a single hop circuit? */ if (circ && (circuit_get_cpath_len(circ)<2 || hop==1)) { const node_t *node = NULL; - char *exit_digest; + char *exit_digest = NULL; if (circ->build_state && circ->build_state->chosen_exit && !tor_digest_is_zero(circ->build_state->chosen_exit->identity_digest)) { @@ -2654,6 +2654,7 @@ handle_control_attachstream(control_connection_t *conn, uint32_t len, "551 Can't attach stream to this one-hop circuit.\r\n", conn); return 0; } + tor_assert(exit_digest); ap_conn->chosen_exit_name = tor_strdup(hex_str(exit_digest, DIGEST_LEN)); } @@ -4921,7 +4922,7 @@ MOCK_IMPL(void, or_connection_t *or_conn)) { int status = bootstrap_percent; - const char *tag, *summary; + const char *tag = "", *summary = ""; char buf[BOOTSTRAP_MSG_LEN]; const char *recommendation = "ignore"; int severity; diff --git a/src/or/dirvote.c b/src/or/dirvote.c index c7be343..137d6c1 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -335,6 +335,9 @@ static int compare_vote_rs(const vote_routerstatus_t *a, const vote_routerstatus_t *b) { int r; + tor_assert(a); + tor_assert(b); + if ((r = fast_memcmp(a->status.identity_digest, b->status.identity_digest, DIGEST_LEN))) return r; @@ -432,6 +435,7 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, const tor_addr_port_t *most_alt_orport = NULL; SMARTLIST_FOREACH_BEGIN(votes, vote_routerstatus_t *, rs) { + tor_assert(rs); if (compare_vote_rs(most, rs) == 0 && !tor_addr_is_null(&rs->status.ipv6_addr) && rs->status.ipv6_orport) { diff --git a/src/or/rephist.c b/src/or/rephist.c index 5446c25..72de54c 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1570,7 +1570,7 @@ rep_hist_load_bwhist_state_section(bw_array_t *b, time_t start; uint64_t v, mv; - int i,ok,ok_m; + int i,ok,ok_m = 0; int have_maxima = s_maxima && s_values && (smartlist_len(s_values) == smartlist_len(s_maxima)); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 5add728..f990ceb 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -923,7 +923,7 @@ router_parse_list_from_string(const char **s, const char *eos, { routerinfo_t *router; extrainfo_t *extrainfo; - signed_descriptor_t *signed_desc; + signed_descriptor_t *signed_desc = NULL; void *elt; const char *end, *start; int have_extrainfo; @@ -980,6 +980,7 @@ router_parse_list_from_string(const char **s, const char *eos, continue; } if (saved_location != SAVED_NOWHERE) { + tor_assert(signed_desc); signed_desc->saved_location = saved_location; signed_desc->saved_offset = *s - start; }

1 0

[tor/release-0.2.5] Adding changes file.
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 8139db372528ca02cd572f3f7848e9d174a9b12e Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Aug 31 14:35:30 2014 +0300 Adding changes file. --- changes/bug12878 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug12878 b/changes/bug12878 new file mode 100644 index 0000000..a05fc44 --- /dev/null +++ b/changes/bug12878 @@ -0,0 +1,3 @@ + o Documentation: + - Document 'reject6' and 'accept6' ExitPolicy entries. Resolves + ticket 12878.

1 0

[tor/master] Fix a number of clang analyzer false-positives
by nickm＠torproject.org 02 Sep '14

02 Sep '14

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit e3c143f5214b4a2d37dbb47940eaf2cc2e212f86 Merge: 67c0ad5 efcab43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 11:58:08 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/ticket13036 | 5 +++++ src/common/address.c | 2 ++ src/or/circuitmux.c | 8 +++++++- src/or/connection.c | 1 + src/or/control.c | 5 +++-- src/or/dirvote.c | 4 ++++ src/or/rephist.c | 2 +- src/or/routerparse.c | 3 ++- 8 files changed, 25 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.5] Fix a number of clang analyzer false-positives
by nickm＠torproject.org 02 Sep '14

02 Sep '14

1 0

← Newer
1
...
85
86
87
88
89
90
91
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2014