May 2014 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug11654_squashed'
by nickm＠torproject.org 01 May '14

01 May '14

commit a2b59dba71687b28546ccc99e98f1a6675ccdc91 Merge: 0e20825 a787575 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 12:34:59 2014 -0400 Merge branch 'bug11654_squashed' changes/bug11654 | 4 ++++ src/or/nodelist.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix memory leaks in test_cntev_append_cell_stats
by nickm＠torproject.org 01 May '14

01 May '14

commit dc0fcbd8121065707274ed22cf8d25c92c3ea80e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 00:12:39 2014 -0400 Fix memory leaks in test_cntev_append_cell_stats --- src/test/test_controller_events.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index 3a9aeca..888f228 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -148,6 +148,7 @@ static void test_cntev_append_cell_stats(void *arg) { smartlist_t *event_parts; + char *cp = NULL; const char *key = "Z"; uint64_t include_if_non_zero[CELL_COMMAND_MAX_ + 1], number_to_include[CELL_COMMAND_MAX_ + 1]; @@ -178,7 +179,9 @@ test_cntev_append_cell_stats(void *arg) append_cell_stats_by_command(event_parts, key, include_if_non_zero, number_to_include); - tt_str_op("Z=relay:1", ==, smartlist_pop_last(event_parts)); + cp = smartlist_pop_last(event_parts); + tt_str_op("Z=relay:1", ==, cp); + tor_free(cp); /* Add four CREATE cells. */ include_if_non_zero[CELL_CREATE] = 3; @@ -186,10 +189,11 @@ test_cntev_append_cell_stats(void *arg) append_cell_stats_by_command(event_parts, key, include_if_non_zero, number_to_include); - tt_str_op("Z=create:4,relay:1", ==, smartlist_pop_last(event_parts)); + cp = smartlist_pop_last(event_parts); + tt_str_op("Z=create:4,relay:1", ==, cp); done: - ; + tor_free(cp); } static void

1 0

[tor/master] Fix memory leak in test_util_asprintf
by nickm＠torproject.org 01 May '14

01 May '14

commit 9fbb5a44b801397be69f5be2c2baff05e93af0f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 00:13:27 2014 -0400 Fix memory leak in test_util_asprintf --- src/test/test_util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6d6b6db..256d849 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2241,18 +2241,21 @@ test_util_asprintf(void *ptr) test_assert(cp); test_streq("simple string 100% safe", cp); test_eq(strlen(cp), r); + tor_free(cp); /* empty string */ r = tor_asprintf(&cp, "%s", ""); test_assert(cp); test_streq("", cp); test_eq(strlen(cp), r); + tor_free(cp); /* numbers (%i) */ r = tor_asprintf(&cp, "I like numbers-%2i, %i, etc.", -1, 2); test_assert(cp); test_streq("I like numbers--1, 2, etc.", cp); test_eq(strlen(cp), r); + /* don't free cp; next test uses it. */ /* numbers (%d) */ r = tor_asprintf(&cp2, "First=%d, Second=%d", 101, 202);

1 0

[tor/master] Fix memory leak in unittest helper function.
by nickm＠torproject.org 01 May '14

01 May '14

commit 1117889f4a1ef7e61c2663258c94f505407d63ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 00:13:49 2014 -0400 Fix memory leak in unittest helper function. --- src/test/test_util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 256d849..f2a0eaf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3146,6 +3146,8 @@ smartlist_new_from_text_lines(const char *lines) last_line = smartlist_pop_last(sl); if (last_line != NULL && *last_line != '\0') { smartlist_add(sl, last_line); + } else { + tor_free(last_line); } return sl;

1 0

[tor/master] Fix a leak in test_buffer_allocation_tracking
by nickm＠torproject.org 01 May '14

01 May '14

commit ffffd860c94ea36970a0c60326ab7a8dc7bb9bda Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 00:18:15 2014 -0400 Fix a leak in test_buffer_allocation_tracking --- src/test/test_buffers.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 6dd7715..1253976 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -513,6 +513,7 @@ test_buffer_allocation_tracking(void *arg) buf_free(buf1); buf_free(buf2); buf_shrink_freelists(1); + tor_free(junk); } static void

1 0

[tor/master] Fix leaks in test_exit_policy_dump_to_string
by nickm＠torproject.org 01 May '14

01 May '14

commit b4b07c17e3ecdcc30f02a7fb2968b675dd970639 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 00:36:09 2014 -0400 Fix leaks in test_exit_policy_dump_to_string --- src/test/test_policy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_policy.c b/src/test/test_policy.c index e3e7b36..4cdcd03 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -394,6 +394,7 @@ test_dump_exit_policy_to_string(void *arg) ep = router_dump_exit_policy_to_string(ri,1,1); test_streq("accept *:*\nreject *:25\nreject 8.8.8.8:*",ep); + tor_free(ep); policy_entry = router_parse_addr_policy_item_from_string("reject6 [FC00::]/7:*",-1); @@ -421,6 +422,7 @@ test_dump_exit_policy_to_string(void *arg) if (ri->exit_policy) { SMARTLIST_FOREACH(ri->exit_policy, addr_policy_t *, entry, addr_policy_free(entry)); + smartlist_free(ri->exit_policy); } tor_free(ri); tor_free(ep);

1 0

[tor/master] test_cntev_append_cell_stats now no longer leaks
by nickm＠torproject.org 01 May '14

01 May '14

commit b11ab0d91dce127096275e472460cae21b30b39c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 00:40:22 2014 -0400 test_cntev_append_cell_stats now no longer leaks --- src/test/test_controller_events.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index 888f228..ee35239 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -194,16 +194,17 @@ test_cntev_append_cell_stats(void *arg) done: tor_free(cp); + smartlist_free(event_parts); } static void test_cntev_format_cell_stats(void *arg) { char *event_string = NULL; - origin_circuit_t *ocirc; - or_circuit_t *or_circ; + origin_circuit_t *ocirc = NULL; + or_circuit_t *or_circ = NULL; cell_stats_t *cell_stats = NULL; - channel_tls_t *n_chan, *p_chan; + channel_tls_t *n_chan=NULL, *p_chan=NULL; (void)arg; n_chan = tor_malloc_zero(sizeof(channel_tls_t)); @@ -286,6 +287,10 @@ test_cntev_format_cell_stats(void *arg) done: tor_free(cell_stats); tor_free(event_string); + tor_free(or_circ); + tor_free(ocirc); + tor_free(p_chan); + tor_free(n_chan); } #define TEST(name, flags) \

1 0

[tor/master] Fix numerous leaks in test_pt.c
by nickm＠torproject.org 01 May '14

01 May '14

commit b60782b6d66de0853320e9a76f0dd9e25e0ec142 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 11:28:39 2014 -0400 Fix numerous leaks in test_pt.c I didn't find a managed_proxy_free() function any place; shouldn't there be one? --- src/test/test_pt.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 3277921..f71627d 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -129,6 +129,8 @@ test_pt_parsing(void) test_assert(parse_version(line, mp) == 0); done: + reset_mp(mp); + smartlist_free(mp->transports); tor_free(mp); } @@ -227,6 +229,10 @@ test_pt_protocol(void) test_assert(mp->conf_state == PT_PROTO_CONFIGURED); done: + reset_mp(mp); + smartlist_free(mp->transports); + tor_free(mp->argv[0]); + tor_free(mp->argv); tor_free(mp); } @@ -423,7 +429,7 @@ test_pt_configure_proxy(void *arg) } done: - tor_free(dummy_state); + or_state_free(dummy_state); UNMOCK(tor_get_lines_from_handle); UNMOCK(tor_process_handle_destroy); UNMOCK(get_or_state); @@ -433,6 +439,15 @@ test_pt_configure_proxy(void *arg) smartlist_free(controlevent_msgs); controlevent_msgs = NULL; } + if (mp->transports) { + SMARTLIST_FOREACH(mp->transports, transport_t *, t, transport_free(t)); + smartlist_free(mp->transports); + } + smartlist_free(mp->transports_to_launch); + tor_free(mp->process_handle); + tor_free(mp->argv[0]); + tor_free(mp->argv); + tor_free(mp); } #define PT_LEGACY(name) \

1 0

[tor/master] Fix leaks in test_oom.c
by nickm＠torproject.org 01 May '14

01 May '14

commit 504e2000ed631425780d4b0e509deb6b59ff2561 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 12:17:10 2014 -0400 Fix leaks in test_oom.c --- src/test/test_oom.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test/test_oom.c b/src/test/test_oom.c index 989ca12..e205673 100644 --- a/src/test/test_oom.c +++ b/src/test/test_oom.c @@ -6,6 +6,7 @@ #define RELAY_PRIVATE #define BUFFERS_PRIVATE #define CIRCUITLIST_PRIVATE +#define CONNECTION_PRIVATE #include "or.h" #include "buffers.h" #include "circuitlist.h" @@ -216,6 +217,7 @@ test_oom_streambuf(void *arg) struct timeval tv = { 1389641159, 0 }; uint32_t tvms; int i; + smartlist_t *edgeconns = smartlist_new(); (void) arg; @@ -257,17 +259,21 @@ test_oom_streambuf(void *arg) tor_gettimeofday_cache_set(&tv); ec = dummy_edge_conn_new(c1, CONN_TYPE_EXIT, 1000, 1000); tt_assert(ec); + smartlist_add(edgeconns, ec); tv.tv_usec += 10*1000; tor_gettimeofday_cache_set(&tv); ec = dummy_edge_conn_new(c2, CONN_TYPE_AP, 1000, 1000); tt_assert(ec); + smartlist_add(edgeconns, ec); tv.tv_usec += 10*1000; tor_gettimeofday_cache_set(&tv); ec = dummy_edge_conn_new(c4, CONN_TYPE_EXIT, 1000, 1000); /* Yes, 4 twice*/ tt_assert(ec); + smartlist_add(edgeconns, ec); tv.tv_usec += 10*1000; tor_gettimeofday_cache_set(&tv); ec = dummy_edge_conn_new(c4, CONN_TYPE_EXIT, 1000, 1000); + smartlist_add(edgeconns, ec); tt_assert(ec); } @@ -302,6 +308,7 @@ test_oom_streambuf(void *arg) tor_gettimeofday_cache_set(&tv); ec = dummy_edge_conn_new(c4, CONN_TYPE_EXIT, 1000, 1000); tt_assert(ec); + smartlist_add(edgeconns, ec); } tt_int_op(buf_get_total_allocation(), ==, 4096*17*2); tt_int_op(circuit_max_queued_item_age(c4, tvms), ==, 1000); @@ -337,6 +344,10 @@ test_oom_streambuf(void *arg) circuit_free(c4); circuit_free(c5); + SMARTLIST_FOREACH(edgeconns, edge_connection_t *, ec, + connection_free_(TO_CONN(ec))); + smartlist_free(edgeconns); + UNMOCK(circuit_mark_for_close_); }

1 0

[tor/master] Fix leaks in test_dir_formats
by nickm＠torproject.org 01 May '14

01 May '14

commit 97664cfd2a83ec79dda7f697054e27daa726ea9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 12:16:12 2014 -0400 Fix leaks in test_dir_formats --- src/test/test_dir.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 9e01bdb..78583fc 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -194,6 +194,7 @@ test_dir_formats(void) test_assert(crypto_pk_cmp_keys(rp1->onion_pkey, pk1) == 0); test_assert(crypto_pk_cmp_keys(rp1->identity_pkey, pk2) == 0); //test_assert(rp1->exit_policy == NULL); + tor_free(buf); strlcpy(buf2, "router Fred 10.3.2.1 9005 0 0\n" @@ -277,6 +278,8 @@ test_dir_formats(void) routerinfo_free(r1); if (r2) routerinfo_free(r2); + if (rp2) + routerinfo_free(rp2); tor_free(buf); tor_free(pk1_str);

1 0