- tor-commits - lists.torproject.org

[tor/master] Make the sandbox work again with chutney.
by nickm＠torproject.org 25 Feb '16

25 Feb '16

commit 7a782820e92cef57afcea6c6936d102d6f4512fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 24 16:01:24 2016 -0500 Make the sandbox work again with chutney. Previously, we had a problem due to the check_private_dir() rewrite. Bug not in any released Tor. --- src/common/sandbox.c | 3 ++- src/or/main.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index d747a87..c04ed5f 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -427,7 +427,8 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } rc = seccomp_rule_add_1(ctx, SCMP_ACT_ERRNO(EACCES), SCMP_SYS(open), - SCMP_CMP_MASKED(1, O_CLOEXEC|O_NONBLOCK|O_NOCTTY, O_RDONLY)); + SCMP_CMP_MASKED(1, O_CLOEXEC|O_NONBLOCK|O_NOCTTY|O_NOFOLLOW, + O_RDONLY)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add open syscall, received libseccomp " "error %d", rc); diff --git a/src/or/main.c b/src/or/main.c index 11caea5..0b45af9 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3300,6 +3300,8 @@ sandbox_init_filter(void) OPEN_DATADIR2(name, name2 suffix); \ } while (0) + OPEN(options->DataDirectory); + OPEN_DATADIR("keys"); OPEN_DATADIR_SUFFIX("cached-certs", ".tmp"); OPEN_DATADIR_SUFFIX("cached-consensus", ".tmp"); OPEN_DATADIR_SUFFIX("unverified-consensus", ".tmp");

1 0

[tor/master] Repare dependency in "make test-stem".
by nickm＠torproject.org 25 Feb '16

25 Feb '16

commit 040ec4d0347235da4fd5696b3eb063e609047024 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 24 15:49:55 2016 -0500 Repare dependency in "make test-stem". --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index fe6f64b..bae506a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -139,10 +139,10 @@ need-stem-path: exit 1; \ fi -test-stem: need-stem-path $(TESTING_TOR_BINARY) +test-stem: need-stem-path all @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL; -test-stem-full: need-stem-path $(TESTING_TOR_BINARY) +test-stem-full: need-stem-path all @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL,ONLINE -v; test-full: need-stem-path need-chutney-path check test-network test-stem

1 0

[tor/master] Fix a huge number of leaks in test_config.c
by nickm＠torproject.org 25 Feb '16

25 Feb '16

commit f2e23d5ad637d0337057d6f5c51644ed23c8d369 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 24 15:44:40 2016 -0500 Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests. --- src/test/test_config.c | 83 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 70 insertions(+), 13 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 6be503a..75786ab 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3752,6 +3752,7 @@ test_config_parse_port_config__listenaddress(void *data) // Port lines for the same portname ret = parse_port_config(NULL, config_port1, config_listen_address, "DNS", 0, NULL, 0, 0); + tt_int_op(ret, OP_EQ, -1); // Test case when we have a listen address, no default port and allow @@ -3842,14 +3843,16 @@ test_config_parse_port_config__listenaddress(void *data) tt_int_op(ret, OP_EQ, 0); done: - tor_free(config_listen_address); - tor_free(config_listen_address2); - tor_free(config_listen_address3); - tor_free(config_port1); - tor_free(config_port2); - tor_free(config_port3); - tor_free(config_port4); - tor_free(config_port5); + config_free_lines(config_listen_address); + config_free_lines(config_listen_address2); + config_free_lines(config_listen_address3); + config_free_lines(config_port1); + /* 2 was linked from 1. */ + config_free_lines(config_port3); + config_free_lines(config_port4); + config_free_lines(config_port5); + if (slout) + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_free(slout); } @@ -3895,6 +3898,7 @@ test_config_parse_port_config__ports__no_ports_given(void *data) tt_int_op(smartlist_len(slout), OP_EQ, 0); // Test with defaultport, with defaultaddress and out, adds a new port cfg + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); ret = parse_port_config(slout, NULL, NULL, "DNS", 0, "127.0.0.2", 42, 0); tt_int_op(ret, OP_EQ, 0); @@ -3905,6 +3909,7 @@ test_config_parse_port_config__ports__no_ports_given(void *data) // Test with defaultport, with defaultaddress and out, adds a new port cfg // for a unix address + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); ret = parse_port_config(slout, NULL, NULL, "DNS", 0, "/foo/bar/unixdomain", 42, CL_PORT_IS_UNIXSOCKET); @@ -3916,6 +3921,8 @@ test_config_parse_port_config__ports__no_ports_given(void *data) tt_str_op(port_cfg->unix_addr, OP_EQ, "/foo/bar/unixdomain"); done: + if (slout) + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_free(slout); } @@ -3952,6 +3959,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, -1); // Test valid unix domain + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", CONN_TYPE_AP_LISTENER, NULL, 0, 0); @@ -3979,6 +3987,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with no ipv4 but take ipv6 (for unix domain sockets, this // makes no sense - it should be fixed) config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "unix:/tmp/foo/bar " "NoIPv4Traffic IPv6Traffic"); @@ -3998,6 +4007,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with both ipv4 and ipv6 (for unix domain sockets, // this makes no sense - it should be fixed) config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "unix:/tmp/foo/bar " "IPv4Traffic IPv6Traffic"); @@ -4037,6 +4047,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with only a port and isolate destination port config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IsolateDestPort"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4049,6 +4060,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with a negative isolate destination port, and plural config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 NoIsolateDestPorts"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4061,6 +4073,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with isolate destination address config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IsolateDestAddr"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4073,6 +4086,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with isolate socks AUTH config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IsolateSOCKSAuth"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4085,6 +4099,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with isolate client protocol config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IsolateClientProtocol"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4097,6 +4112,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with isolate client address config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IsolateClientAddr"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4116,6 +4132,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with no isolate socks AUTH config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 NoIsolateSOCKSAuth"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4127,6 +4144,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with prefer ipv6 config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IPv6Traffic PreferIPv6"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", @@ -4139,6 +4157,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with cache ipv4 DNS config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 CacheIPv4DNS"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4151,6 +4170,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with cache ipv6 DNS config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 CacheIPv6DNS"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4163,6 +4183,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with no cache ipv4 DNS config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 NoCacheIPv4DNS"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4175,6 +4196,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with cache DNS config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 CacheDNS"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4187,6 +4209,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with use cached ipv4 DNS config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 UseIPv4Cache"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4199,6 +4222,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with use cached ipv6 DNS config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 UseIPv6Cache"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4211,6 +4235,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with use cached DNS config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 UseDNSCache"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4223,6 +4248,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with not preferring ipv6 automap config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 NoPreferIPv6Automap"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4234,6 +4260,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with prefer SOCKS no auth config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 PreferSOCKSNoAuth"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4246,6 +4273,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test failure with both a zero port and a non-zero port config_free_lines(config_port_invalid); config_port_invalid = NULL; config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "0"); config_port_valid = mock_config_line("DNSPort", "42"); @@ -4255,6 +4283,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, -1); // Test success with warn non-local control + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", CONN_TYPE_CONTROL_LISTENER, "127.0.0.42", 0, @@ -4262,6 +4291,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, 0); // Test success with warn non-local listener + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", CONN_TYPE_EXT_OR_LISTENER, "127.0.0.42", 0, @@ -4269,6 +4299,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, 0); // Test success with warn non-local other + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, "127.0.0.42", 0, CL_PORT_WARN_NONLOCAL); @@ -4280,7 +4311,9 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, 0); // Test success with both ipv4 and ipv6 but without stream options - config_free_lines(config_port_valid); config_port_valid = NULL; + config_free_lines(config_port_invalid); config_port_invalid = NULL; + config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IPv4Traffic " "IPv6Traffic"); @@ -4295,7 +4328,8 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 0); // Test failure for a SessionGroup argument with invalid value - config_free_lines(config_port_valid); config_port_valid = NULL; + config_free_lines(config_port_invalid); config_port_invalid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=invalid"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0, @@ -4307,6 +4341,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test failure for a SessionGroup argument with valid value but with stream // options allowed config_free_lines(config_port_invalid); config_port_invalid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0, @@ -4315,6 +4350,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test failure for more than one SessionGroup argument config_free_lines(config_port_invalid); config_port_invalid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123 " "SessionGroup=321"); @@ -4323,7 +4359,8 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, -1); // Test success with a sessiongroup options - config_free_lines(config_port_invalid); config_port_invalid = NULL; + config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 SessionGroup=1111122"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4335,6 +4372,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with a zero unix domain socket, and doesnt add it to out config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "0"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4344,6 +4382,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with a one unix domain socket, and doesnt add it to out config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "something"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4356,6 +4395,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with a port of auto - it uses the default address config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "auto"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4369,6 +4409,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with parsing both an address and an auto port config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.122:auto"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4389,6 +4430,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with parsing both an address and a real port config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.123:656"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4401,7 +4443,8 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_assert(tor_addr_eq(&port_cfg->addr, &addr)) // Test failure if we can't parse anything at all - config_free_lines(config_port_valid); config_port_valid = NULL; + config_free_lines(config_port_invalid); config_port_invalid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "something wrong"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0, @@ -4410,6 +4453,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test failure if we find both an address, a port and an auto config_free_lines(config_port_invalid); config_port_invalid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "127.0.1.0:123:auto"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0, @@ -4418,7 +4462,8 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test that default to group writeable default sets group writeable for // domain socket - config_free_lines(config_port_invalid); config_port_invalid = NULL; + config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "unix:/tmp/somewhere"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", @@ -4434,6 +4479,8 @@ test_config_parse_port_config__ports__ports_given(void *data) #endif done: + if (slout) + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_free(slout); config_free_lines(config_port_invalid); config_port_invalid = NULL; config_free_lines(config_port_valid); config_port_valid = NULL; @@ -4464,6 +4511,7 @@ test_config_parse_port_config__ports__server_options(void *data) // Test success with NoListen option config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.124:656 NoListen"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, NULL, 0, @@ -4476,6 +4524,7 @@ test_config_parse_port_config__ports__server_options(void *data) // Test failure with both NoAdvertise and NoListen option config_free_lines(config_port_invalid); config_port_invalid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "127.0.0.124:656 NoListen " "NoAdvertise"); @@ -4485,6 +4534,7 @@ test_config_parse_port_config__ports__server_options(void *data) // Test success with IPv4Only config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.124:656 IPv4Only"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, NULL, 0, @@ -4497,6 +4547,7 @@ test_config_parse_port_config__ports__server_options(void *data) // Test success with IPv6Only config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "[::1]:656 IPv6Only"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, NULL, 0, @@ -4509,6 +4560,7 @@ test_config_parse_port_config__ports__server_options(void *data) // Test failure with both IPv4Only and IPv6Only config_free_lines(config_port_invalid); config_port_invalid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "127.0.0.124:656 IPv6Only " "IPv4Only"); @@ -4518,6 +4570,7 @@ test_config_parse_port_config__ports__server_options(void *data) // Test success with invalid parameter config_free_lines(config_port_valid); config_port_valid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.124:656 unknown"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, NULL, 0, @@ -4527,6 +4580,7 @@ test_config_parse_port_config__ports__server_options(void *data) // Test failure when asked to bind only to ipv6 but gets an ipv4 address config_free_lines(config_port_invalid); config_port_invalid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "127.0.0.124:656 IPv6Only"); @@ -4536,6 +4590,7 @@ test_config_parse_port_config__ports__server_options(void *data) // Test failure when asked to bind only to ipv4 but gets an ipv6 address config_free_lines(config_port_invalid); config_port_invalid = NULL; + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "[::1]:656 IPv4Only"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0, NULL, @@ -4543,6 +4598,8 @@ test_config_parse_port_config__ports__server_options(void *data) tt_int_op(ret, OP_EQ, -1); done: + if (slout) + SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_free(slout); config_free_lines(config_port_invalid); config_port_invalid = NULL; config_free_lines(config_port_valid); config_port_valid = NULL;

1 0

[tor/master] Fix memory leaks in routerlist/pick_directory_server_impl test
by nickm＠torproject.org 25 Feb '16

25 Feb '16

commit a3f764ea692cefa534d05e6e661b8b9c3a9e8429 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 24 15:13:29 2016 -0500 Fix memory leaks in routerlist/pick_directory_server_impl test --- src/test/test_routerlist.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index 31533d0..8b37cc0 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -30,7 +30,7 @@ extern const char AUTHORITY_SIGNKEY_2[]; extern const char AUTHORITY_CERT_3[]; extern const char AUTHORITY_SIGNKEY_3[]; -void construct_consensus(const char **consensus_text_md); +void construct_consensus(char **consensus_text_md); /* 4 digests + 3 sep + pre + post + NULL */ static char output[4*BASE64_DIGEST256_LEN+3+2+2+1]; @@ -120,7 +120,7 @@ test_routerlist_launch_descriptor_downloads(void *arg) } void -construct_consensus(const char **consensus_text_md) +construct_consensus(char **consensus_text_md) { networkstatus_t *vote = NULL; networkstatus_t *v1 = NULL, *v2 = NULL, *v3 = NULL; @@ -180,6 +180,14 @@ construct_consensus(const char **consensus_text_md) networkstatus_vote_free(v1); networkstatus_vote_free(v2); networkstatus_vote_free(v3); + smartlist_free(votes); + authority_cert_free(cert1); + authority_cert_free(cert2); + authority_cert_free(cert3); + crypto_pk_free(sign_skey_1); + crypto_pk_free(sign_skey_2); + crypto_pk_free(sign_skey_3); + crypto_pk_free(sign_skey_leg); } static void @@ -188,7 +196,7 @@ test_router_pick_directory_server_impl(void *arg) (void)arg; networkstatus_t *con_md = NULL; - const char *consensus_text_md = NULL; + char *consensus_text_md = NULL; int flags = PDS_IGNORE_FASCISTFIREWALL|PDS_RETRY_IF_NO_SERVERS; or_options_t *options = get_options_mutable(); const routerstatus_t *rs = NULL; @@ -363,6 +371,8 @@ test_router_pick_directory_server_impl(void *arg) if (options->ReachableORAddresses || options->ReachableDirAddresses) policies_free_all(); + tor_free(consensus_text_md); + networkstatus_vote_free(con_md); } connection_t *mocked_connection = NULL;

1 0

[tor/master] Fix a leak in test_have_enough_mem_for_dircache
by nickm＠torproject.org 25 Feb '16

25 Feb '16

commit ba0ddd7467329bb7b6b201c0bd11bf99abcd0d7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 24 15:06:12 2016 -0500 Fix a leak in test_have_enough_mem_for_dircache --- src/test/test_options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 547464a..68e8f91 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -210,7 +210,7 @@ test_have_enough_mem_for_dircache(void *arg) { (void)arg; or_options_t *opt=NULL; - or_options_t *dflt; + or_options_t *dflt=NULL; config_line_t *cl=NULL; char *msg=NULL;; int r; @@ -292,7 +292,7 @@ test_have_enough_mem_for_dircache(void *arg) done: if (msg) tor_free(msg); - tor_free(dflt); + or_options_free(dflt); or_options_free(opt); config_free_lines(cl); return;

1 0

[tor-messenger-build/master] Account for async send when closing convo window w/ otr
by arlo＠torproject.org 25 Feb '16

25 Feb '16

commit ec7194b41700eee0c1f583c321538ace92f6de68 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Feb 24 11:50:22 2016 -0800 Account for async send when closing convo window w/ otr --- projects/instantbird/trac-13312.patch | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/projects/instantbird/trac-13312.patch b/projects/instantbird/trac-13312.patch index 37a81a7..7eb92b2 100644 --- a/projects/instantbird/trac-13312.patch +++ b/projects/instantbird/trac-13312.patch @@ -629,10 +629,10 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. +var NSGetFactory = XPCOMUtils.generateNSGetFactory([TwitterProtocol]); # HG changeset patch # User Arlo Breault <arlolra(a)gmail.com> -# Date 1456282265 28800 -# Tue Feb 23 18:51:05 2016 -0800 +# Date 1456343323 28800 +# Wed Feb 24 11:48:43 2016 -0800 # Branch THUNDERBIRD420b2_2015101216_RELBRANCH -# Node ID 01edd1bf5e56e382611823a8f0ab604743c78b02 +# Node ID 1302396bc5605fff3ba7b2b7a762db98630378fa # Parent 9d547deb66802e3068767b5df2e687f6a56c5099 Bug 955642 - Handle Twitter direct messages (DMs) @@ -1273,7 +1273,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. if (this.incoming) { actions.push( new Action(_("action.retweet"), function() { -@@ -118,17 +127,104 @@ function Action(aLabel, aAction, aTweet) +@@ -118,17 +127,109 @@ function Action(aLabel, aAction, aTweet) this._action = aAction; this._tweet = aTweet; } @@ -1299,6 +1299,11 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. + this.writeMessage("twitter.com", aMessage, flags); + }, + onSentCallback: function(aMsg, aData) { ++ // The conversation may have been unitialized in the time it takes for ++ // the async callback to fire. Use `_observers` as a proxy for uninit'd. ++ if (!Array.isArray(this._observers)) ++ return; ++ + let tweet = JSON.parse(aData); + // The OTR extension requires that the protocol not modify the message + // (see the notes at `imIOutgoingMessage`). That's the contract we made. @@ -1379,7 +1384,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. let entries = []; for (let [name, userInfo] of aAccount._userInfo) { entries.push([userInfo.id_str, name]); -@@ -139,17 +235,17 @@ function Conversation(aAccount) +@@ -139,17 +240,17 @@ function Conversation(aAccount) // If the user's info has already been received, update the timeline topic. if (aAccount._userInfo.has(aAccount.name)) { @@ -1398,7 +1403,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. inReplyToStatusId: null, startReply: function(aTweet) { this.inReplyToStatusId = aTweet.id_str; -@@ -169,203 +265,66 @@ Conversation.prototype = { +@@ -169,203 +270,66 @@ Conversation.prototype = { .map(aNick => "@" + aNick) .join(" ") + " "; @@ -1627,7 +1632,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. let chatBuddy = new ChatBuddy(aNick, this._account); this._participants.set(aNick, chatBuddy); this.notifyObservers(new nsSimpleEnumerator([chatBuddy]), -@@ -377,23 +336,60 @@ Conversation.prototype = { +@@ -377,23 +341,60 @@ Conversation.prototype = { set nick(aNick) {}, get topicSettable() { return this.nick == this._account.name; }, get topic() { return this._topic; }, // can't add a setter without redefining the getter @@ -1688,7 +1693,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. // Unfortunately, for backwards compatibility we retain this normalization, // which can cause edge cases for usernames with underscores. normalize: aString => aString.replace(/[^a-z0-9]/gi, "").toLowerCase(), -@@ -554,16 +550,21 @@ Account.prototype = { +@@ -554,16 +555,21 @@ Account.prototype = { reTweet: function(aTweet, aOnSent, aOnError, aThis) { let url = "1.1/statuses/retweet/" + aTweet.id_str + ".json"; this.signAndSend(url, null, [], aOnSent, aOnError, aThis); @@ -1710,7 +1715,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. }, stopFollowing: function(aUserName) { // friendships/destroy will return the user in case of success. -@@ -615,39 +616,17 @@ Account.prototype = { +@@ -615,39 +621,17 @@ Account.prototype = { getParams = "?q=" + trackQuery + lastMsgParam + "&count=100"; let url = "1.1/search/tweets.json" + getParams; this._pendingRequests.push( @@ -1751,7 +1756,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. this._doneWithTimelineRequest(aRequest); }, -@@ -685,17 +664,17 @@ Account.prototype = { +@@ -685,17 +669,17 @@ Account.prototype = { this.reportConnected(); // If the conversation already exists, notify it we are back online. @@ -1770,7 +1775,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. delete this._timelineBuffer; delete this._pendingRequests; -@@ -747,18 +726,23 @@ Account.prototype = { +@@ -747,18 +731,23 @@ Account.prototype = { continue; let msg; try { @@ -1796,7 +1801,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. userInfoIds.add(userInfo.id_str); let ids = msg.friends.filter( aId => !userInfoIds.has(aId.toString())); -@@ -1099,16 +1083,29 @@ Account.prototype = { +@@ -1099,16 +1088,29 @@ Account.prototype = { this.config = JSON.parse(aData); },

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 25 Feb '16

25 Feb '16

commit 7e5a10b477635053c7b8b48636cc77435c629ab1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 24 19:45:21 2016 +0000 Update translations for https_everywhere_completed --- hu/https-everywhere.dtd | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hu/https-everywhere.dtd b/hu/https-everywhere.dtd index 3816a69..a8f0342 100644 --- a/hu/https-everywhere.dtd +++ b/hu/https-everywhere.dtd @@ -14,6 +14,7 @@ <!ENTITY https-everywhere.about.or "vagy"> <!ENTITY https-everywhere.about.donate_eff "Az EFF támogatása"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Támogatás az EFF-nek"> <!ENTITY https-everywhere.menu.about "A HTTPS Everywhere névjegye"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferenciák"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere bekapcsolása"> @@ -41,3 +42,15 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Titkosított kapcsolatok kényszerítése ezekhez a weboldalakhoz:"> <!ENTITY https-everywhere.chrome.experimental_rules "Kísérleti szabályok"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Figyelmeztetéseket és megszakításokat okozhat. Alapértelmezésben letiltva."> +<!ENTITY https-everywhere.chrome.add_rule "Szabály felvétel az oldalhoz"> +<!ENTITY https-everywhere.chrome.add_new_rule "Új szabály az oldalhoz"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Mindig https-t használjon ehhez a kiszolgálóhoz"> +<!ENTITY https-everywhere.chrome.host "Kiszolgáló:"> +<!ENTITY https-everywhere.chrome.show_advanced "Speciális beállítások megjelenítése"> +<!ENTITY https-everywhere.chrome.hide_advanced "Speciális beállítások elrejtése"> +<!ENTITY https-everywhere.chrome.rule_name "Szabály neve"> +<!ENTITY https-everywhere.chrome.regex "Illeszkedő regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Átirányítás ide:"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Mégsem"> + +

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 25 Feb '16

25 Feb '16

commit 243923410b2b265784d4d7b7c35ebb9a2eb0762a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 24 19:45:15 2016 +0000 Update translations for https_everywhere --- hu/https-everywhere.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hu/https-everywhere.dtd b/hu/https-everywhere.dtd index 206e44a..a8f0342 100644 --- a/hu/https-everywhere.dtd +++ b/hu/https-everywhere.dtd @@ -14,7 +14,7 @@ <!ENTITY https-everywhere.about.or "vagy"> <!ENTITY https-everywhere.about.donate_eff "Az EFF támogatása"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Támogatás az EFF-nek"> <!ENTITY https-everywhere.menu.about "A HTTPS Everywhere névjegye"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferenciák"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere bekapcsolása"> @@ -42,15 +42,15 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Titkosított kapcsolatok kényszerítése ezekhez a weboldalakhoz:"> <!ENTITY https-everywhere.chrome.experimental_rules "Kísérleti szabályok"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Figyelmeztetéseket és megszakításokat okozhat. Alapértelmezésben letiltva."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> -<!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> -<!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.add_rule "Szabály felvétel az oldalhoz"> +<!ENTITY https-everywhere.chrome.add_new_rule "Új szabály az oldalhoz"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Mindig https-t használjon ehhez a kiszolgálóhoz"> +<!ENTITY https-everywhere.chrome.host "Kiszolgáló:"> +<!ENTITY https-everywhere.chrome.show_advanced "Speciális beállítások megjelenítése"> +<!ENTITY https-everywhere.chrome.hide_advanced "Speciális beállítások elrejtése"> +<!ENTITY https-everywhere.chrome.rule_name "Szabály neve"> +<!ENTITY https-everywhere.chrome.regex "Illeszkedő regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Átirányítás ide:"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Mégsem">

1 0

[tor/master] Remove the freelist from memarea.c
by nickm＠torproject.org 25 Feb '16

25 Feb '16

commit 73c433a48a15808c87fafbbfe43da60cc4ab7b0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 24 14:32:09 2016 -0500 Remove the freelist from memarea.c This is in accordance with our usual policy against freelists, now that working allocators are everywhere. It should also make memarea.c's coverage higher. I also doubt that this code ever helped performance. --- changes/remove_memarea_freelist | 4 +++ src/common/memarea.c | 75 +++++++++++------------------------------ src/common/memarea.h | 1 - src/common/timing.c | 0 src/or/main.c | 1 - src/test/test_dir.c | 2 -- src/test/test_options.c | 24 ------------- 7 files changed, 23 insertions(+), 84 deletions(-) diff --git a/changes/remove_memarea_freelist b/changes/remove_memarea_freelist new file mode 100644 index 0000000..dd9520c --- /dev/null +++ b/changes/remove_memarea_freelist @@ -0,0 +1,4 @@ + o Removed code: + - We no longer maintain an internal freelist in memarea.c. Allocators + should be good enough to make this code unnecessary, and it's doubtful + that it ever had any performance benefit. diff --git a/src/common/memarea.c b/src/common/memarea.c index a8e6d45..b648c29 100644 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@ -105,56 +105,32 @@ struct memarea_t { memarea_chunk_t *first; /**< Top of the chunk stack: never NULL. */ }; -/** How many chunks will we put into the freelist before freeing them? */ -#define MAX_FREELIST_LEN 4 -/** The number of memarea chunks currently in our freelist. */ -static int freelist_len=0; -/** A linked list of unused memory area chunks. Used to prevent us from - * spinning in malloc/free loops. */ -static memarea_chunk_t *freelist = NULL; - /** Helper: allocate a new memarea chunk of around chunk_size bytes. */ static memarea_chunk_t * -alloc_chunk(size_t sz, int freelist_ok) +alloc_chunk(size_t sz) { tor_assert(sz < SIZE_T_CEILING); - if (freelist && freelist_ok) { - memarea_chunk_t *res = freelist; - freelist = res->next_chunk; - res->next_chunk = NULL; - --freelist_len; - CHECK_SENTINEL(res); - return res; - } else { - size_t chunk_size = freelist_ok ? CHUNK_SIZE : sz; - memarea_chunk_t *res; - chunk_size += SENTINEL_LEN; - res = tor_malloc(chunk_size); - res->next_chunk = NULL; - res->mem_size = chunk_size - CHUNK_HEADER_SIZE - SENTINEL_LEN; - res->next_mem = res->U_MEM; - tor_assert(res->next_mem+res->mem_size+SENTINEL_LEN == - ((char*)res)+chunk_size); - tor_assert(realign_pointer(res->next_mem) == res->next_mem); - SET_SENTINEL(res); - return res; - } + + size_t chunk_size = sz < CHUNK_SIZE ? CHUNK_SIZE : sz; + memarea_chunk_t *res; + chunk_size += SENTINEL_LEN; + res = tor_malloc(chunk_size); + res->next_chunk = NULL; + res->mem_size = chunk_size - CHUNK_HEADER_SIZE - SENTINEL_LEN; + res->next_mem = res->U_MEM; + tor_assert(res->next_mem+res->mem_size+SENTINEL_LEN == + ((char*)res)+chunk_size); + tor_assert(realign_pointer(res->next_mem) == res->next_mem); + SET_SENTINEL(res); + return res; } -/** Release chunk from a memarea, either by adding it to the freelist - * or by freeing it if the freelist is already too big. */ +/** Release chunk from a memarea. */ static void chunk_free_unchecked(memarea_chunk_t *chunk) { CHECK_SENTINEL(chunk); - if (freelist_len < MAX_FREELIST_LEN) { - ++freelist_len; - chunk->next_chunk = freelist; - freelist = chunk; - chunk->next_mem = chunk->U_MEM; - } else { - tor_free(chunk); - } + tor_free(chunk); } /** Allocate and return new memarea. */ @@ -162,7 +138,7 @@ memarea_t * memarea_new(void) { memarea_t *head = tor_malloc(sizeof(memarea_t)); - head->first = alloc_chunk(CHUNK_SIZE, 1); + head->first = alloc_chunk(CHUNK_SIZE); return head; } @@ -197,19 +173,6 @@ memarea_clear(memarea_t *area) area->first->next_mem = area->first->U_MEM; } -/** Remove all unused memarea chunks from the internal freelist. */ -void -memarea_clear_freelist(void) -{ - memarea_chunk_t *chunk, *next; - freelist_len = 0; - for (chunk = freelist; chunk; chunk = next) { - next = chunk->next_chunk; - tor_free(chunk); - } - freelist = NULL; -} - /** Return true iff p is in a range that has been returned by an * allocation from area. */ int @@ -241,12 +204,12 @@ memarea_alloc(memarea_t *area, size_t sz) if (sz+CHUNK_HEADER_SIZE >= CHUNK_SIZE) { /* This allocation is too big. Stick it in a special chunk, and put * that chunk second in the list. */ - memarea_chunk_t *new_chunk = alloc_chunk(sz+CHUNK_HEADER_SIZE, 0); + memarea_chunk_t *new_chunk = alloc_chunk(sz+CHUNK_HEADER_SIZE); new_chunk->next_chunk = chunk->next_chunk; chunk->next_chunk = new_chunk; chunk = new_chunk; } else { - memarea_chunk_t *new_chunk = alloc_chunk(CHUNK_SIZE, 1); + memarea_chunk_t *new_chunk = alloc_chunk(CHUNK_SIZE); new_chunk->next_chunk = chunk; area->first = chunk = new_chunk; } diff --git a/src/common/memarea.h b/src/common/memarea.h index d14f3a2..4b2f3b4 100644 --- a/src/common/memarea.h +++ b/src/common/memarea.h @@ -18,7 +18,6 @@ char *memarea_strdup(memarea_t *area, const char *s); char *memarea_strndup(memarea_t *area, const char *s, size_t n); void memarea_get_stats(memarea_t *area, size_t *allocated_out, size_t *used_out); -void memarea_clear_freelist(void); void memarea_assert_ok(memarea_t *area); #endif diff --git a/src/common/timing.c b/src/common/timing.c new file mode 100644 index 0000000..e69de29 diff --git a/src/or/main.c b/src/or/main.c index 96a56fc..11caea5 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3100,7 +3100,6 @@ tor_free_all(int postfork) connection_free_all(); connection_edge_free_all(); scheduler_free_all(); - memarea_clear_freelist(); nodelist_free_all(); microdesc_free_all(); ext_orport_free_all(); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 72e619f..49719b9 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -497,7 +497,6 @@ test_dir_routerinfo_parsing(void *arg) #undef CHECK_FAIL #undef CHECK_OK done: - memarea_clear_freelist(); routerinfo_free(ri); } @@ -601,7 +600,6 @@ test_dir_extrainfo_parsing(void *arg) done: escaped(NULL); - memarea_clear_freelist(); extrainfo_free(ei); routerinfo_free(ri); digestmap_free((digestmap_t*)map, routerinfo_free_wrapper_); diff --git a/src/test/test_options.c b/src/test/test_options.c index b2be8a9..547464a 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -158,7 +158,6 @@ test_options_validate_impl(const char *configuration, } done: - memarea_clear_freelist(); escaped(NULL); policies_free_all(); config_free_lines(cl); @@ -1949,7 +1948,6 @@ test_options_validate__use_bridges(void *ignored) done: NS_UNMOCK(geoip_get_country); - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -2187,7 +2185,6 @@ test_options_validate__publish_server_descriptor(void *ignored) done: teardown_capture_of_logs(previous_log); - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -2263,7 +2260,6 @@ test_options_validate__testing(void *ignored) done: escaped(NULL); // This will free the leaking memory from the previous escaped - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -2311,7 +2307,6 @@ test_options_validate__hidserv(void *ignored) done: teardown_capture_of_logs(previous_log); - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -2336,7 +2331,6 @@ test_options_validate__predicted_ports(void *ignored) done: teardown_capture_of_logs(previous_log); - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -2539,7 +2533,6 @@ test_options_validate__bandwidth(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -2627,7 +2620,6 @@ test_options_validate__circuits(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); teardown_capture_of_logs(previous_log); free_options_test_data(tdata); @@ -2661,7 +2653,6 @@ test_options_validate__port_forwarding(void *ignored) done: free_options_test_data(tdata); - memarea_clear_freelist(); policies_free_all(); tor_free(msg); } @@ -2691,7 +2682,6 @@ test_options_validate__tor2web(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -2758,7 +2748,6 @@ test_options_validate__rend(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); teardown_capture_of_logs(previous_log); free_options_test_data(tdata); @@ -2878,7 +2867,6 @@ test_options_validate__accounting(void *ignored) done: teardown_capture_of_logs(previous_log); - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -3210,7 +3198,6 @@ test_options_validate__proxy(void *ignored) done: teardown_capture_of_logs(previous_log); free_options_test_data(tdata); - memarea_clear_freelist(); policies_free_all(); // sandbox_free_getaddrinfo_cache(); tor_free(msg); @@ -3438,7 +3425,6 @@ test_options_validate__control(void *ignored) done: teardown_capture_of_logs(previous_log); - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -3511,7 +3497,6 @@ test_options_validate__families(void *ignored) done: teardown_capture_of_logs(previous_log); - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -3536,7 +3521,6 @@ test_options_validate__addr_policies(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -3623,7 +3607,6 @@ test_options_validate__dir_auth(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); teardown_capture_of_logs(previous_log); free_options_test_data(tdata); @@ -3749,7 +3732,6 @@ test_options_validate__transport(void *ignored) done: escaped(NULL); // This will free the leaking memory from the previous escaped - memarea_clear_freelist(); policies_free_all(); teardown_capture_of_logs(previous_log); free_options_test_data(tdata); @@ -3833,7 +3815,6 @@ test_options_validate__constrained_sockets(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); teardown_capture_of_logs(previous_log); free_options_test_data(tdata); @@ -4053,7 +4034,6 @@ test_options_validate__v3_auth(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); teardown_capture_of_logs(previous_log); free_options_test_data(tdata); @@ -4088,7 +4068,6 @@ test_options_validate__virtual_addr(void *ignored) done: escaped(NULL); // This will free the leaking memory from the previous escaped - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg); @@ -4130,7 +4109,6 @@ test_options_validate__exits(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); teardown_capture_of_logs(previous_log); free_options_test_data(tdata); @@ -4299,7 +4277,6 @@ test_options_validate__testing_options(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); teardown_capture_of_logs(previous_log); free_options_test_data(tdata); @@ -4353,7 +4330,6 @@ test_options_validate__accel(void *ignored) tor_free(msg); done: - memarea_clear_freelist(); policies_free_all(); free_options_test_data(tdata); tor_free(msg);

1 0

[tor-messenger-build/master] Bump ctypes-otr
by arlo＠torproject.org 25 Feb '16

25 Feb '16

commit 1f5b6dd26ac09b5947ab8bc83d0bec5088069d65 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Feb 24 10:59:53 2016 -0800 Bump ctypes-otr --- projects/ctypes-otr/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 299300c..611116d 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/arlolra/ctypes-otr -git_hash: 61a6472c732dc4a03b5b315c645c9f265a67b9c6 +git_hash: d733f71db6b08f25c3e01fed071d3fe84bab6352 filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: lib_glob: 'lib/*.so*'

1 0