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

[tor/master] Merge branch 'bug30455_041' into bug30455_master
by asn＠torproject.org 26 Jun '19

26 Jun '19

commit 6b136c18e1db40aaca7e7c32436989abf767a5c0 Merge: 438b7eec8 e218da172 Author: teor <teor(a)torproject.org> Date: Fri Jun 14 11:49:02 2019 +1000 Merge branch 'bug30455_041' into bug30455_master Makefile.am | 19 +++++++++++-------- changes/bug30455 | 5 +++++ 2 files changed, 16 insertions(+), 8 deletions(-)

1 0

[tor/master] make: Improve the documentation for test-network-all
by asn＠torproject.org 26 Jun '19

26 Jun '19

commit e218da17229adcec3c0a4ce774c0963bfcf1f11e Author: teor <teor(a)torproject.org> Date: Fri Jun 14 11:44:26 2019 +1000 make: Improve the documentation for test-network-all "make test-network-all" shows the warnings from each test-network.sh run on the console, so developers see new warnings early. Improve the documentation for this feature, and rename a Makefile variable so the code is self-documenting. Fixes bug 30455; bugfix on 0.3.0.4-rc. --- Makefile.am | 19 +++++++++++-------- changes/bug30455 | 5 +++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7a0d40d6a..333fcf2e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -185,7 +185,7 @@ TEST_CFLAGS= TEST_CPPFLAGS=-DTOR_UNIT_TESTS @TOR_MODULES_ALL_ENABLED@ TEST_NETWORK_FLAGS=--hs-multi-client 1 endif -TEST_NETWORK_WARNING_FLAGS=--quiet --only-warnings +TEST_NETWORK_SHOW_WARNINGS_FOR_LAST_RUN_FLAGS=--quiet --only-warnings if LIBFUZZER_ENABLED TEST_CFLAGS += -fsanitize-coverage=trace-pc-guard,trace-cmp,trace-div @@ -250,12 +250,15 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_FLAGS) # Run all available tests using automake's test-driver -# only run IPv6 tests if we can ping6 ::1 (localhost) -# only run IPv6 tests if we can ping ::1 (localhost) -# some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011) -# only run mixed tests if we have a tor-stable binary -# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6, -# because they're incompatible +# - only run IPv6 tests if we can ping6 or ping -6 ::1 (localhost) +# we try the syntax for BSD ping6, Linux ping6, and Linux ping -6, +# because they're incompatible +# - some IPv6 tests may fail without an IPv6 DNS server +# (see #16971 and #17011) +# - only run mixed tests if we have a tor-stable binary +# - show tor warnings on the console after each network run +# (otherwise, warnings go to the logs, and people don't see them unless +# there is a network failure) test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log $(TEST_NETWORK_ALL_LOG_DIR)/*.trs @@ -279,7 +282,7 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ done; \ for f in $$flavors; do \ $(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) $(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \ - $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_WARNING_FLAGS); \ + $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_SHOW_WARNINGS_FOR_LAST_RUN_FLAGS); \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs diff --git a/changes/bug30455 b/changes/bug30455 new file mode 100644 index 000000000..aecbde5a3 --- /dev/null +++ b/changes/bug30455 @@ -0,0 +1,5 @@ + o Minor bugfixes (chutney, makefiles, documentation): + - "make test-network-all" shows the warnings from each test-network.sh + run on the console, so developers see new warnings early. Improve the + documentation for this feature, and rename a Makefile variable so the + code is self-documenting. Fixes bug 30455; bugfix on 0.3.0.4-rc.

1 0

[tor/master] Merge branch 'tor-github/pr/1109'
by asn＠torproject.org 26 Jun '19

26 Jun '19

commit 7edd01a29bb772e09fccb4296c47c6bfd834e0e5 Merge: a57296da3 6b136c18e Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 26 10:56:08 2019 +0300 Merge branch 'tor-github/pr/1109' Makefile.am | 19 +++++++++++-------- changes/bug30455 | 5 +++++ 2 files changed, 16 insertions(+), 8 deletions(-)

1 0

[tor/master] Don't try to shellcheck src/rust/registry
by asn＠torproject.org 26 Jun '19

26 Jun '19

commit a87700633c91f98d3cef16bc7e4809a7ab6b4c2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 13:45:05 2019 -0400 Don't try to shellcheck src/rust/registry Fixes bug 30963; bug not in any released Tor. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index df30e0b59..67ef77f87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -224,7 +224,7 @@ test: all shellcheck: # Only use shellcheck if it is present if command -v shellcheck; then \ - find "$(top_srcdir)" -name "*.sh" -not -path "$(top_srcdir)/src/ext/*" -exec shellcheck {} +; \ + find "$(top_srcdir)" -name "*.sh" -not -path "$(top_srcdir)/src/ext/*" -not -path "$(top_srcdir)/src/rust/registry/*" -exec shellcheck {} +; \ if [ -d "$(top_srcdir)/scripts/test" ]; then \ shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_srcdir)/scripts/test/coverage; \ fi; \

1 0

[tor/master] Merge branch 'tor-github/pr/1139'
by asn＠torproject.org 26 Jun '19

26 Jun '19

commit a57296da31ced1986ede513fcc52212f0f04879a Merge: fede64822 a87700633 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 26 10:55:05 2019 +0300 Merge branch 'tor-github/pr/1139' Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'tor-github/pr/1128'
by asn＠torproject.org 26 Jun '19

26 Jun '19

commit fede64822d50c7ecb59e0d0c1da10473ee33ccae Merge: b2ef076e1 a52e00b5b Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 26 10:53:34 2019 +0300 Merge branch 'tor-github/pr/1128' src/test/test_rebind.sh | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/master] Fix shellcheck warning SC2034 in test_rebind.sh.
by asn＠torproject.org 26 Jun '19

26 Jun '19

commit a52e00b5b315101ccb84c0ed981b6f34c4c52def Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 23 14:00:43 2019 +0300 Fix shellcheck warning SC2034 in test_rebind.sh. Bugfix on be0a4be276c945e4e90b43ce8f784b5b75bef122 (not in any Tor release). --- src/test/test_rebind.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index e0d8394d3..d6d9d8666 100755 --- a/src/test/test_rebind.sh +++ b/src/test/test_rebind.sh @@ -12,8 +12,6 @@ if test "$UNAME_OS" = 'CYGWIN' || \ fi fi -exitcode=0 - tmpdir= clean () { if [ -n "$tmpdir" ] && [ -d "$tmpdir" ]; then

1 0

[tor/maint-0.4.1] Fix memleak when failing to parse a CSV_INTERVAL.
by asn＠torproject.org 26 Jun '19

26 Jun '19

commit 4ab1d1c0c44a887417b04fc75b1b11bf246f2bb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 15 16:47:16 2019 -0400 Fix memleak when failing to parse a CSV_INTERVAL. Fixes bug 30894; bugfix on 0.3.4.1-alpha --- changes/bug30894 | 4 ++++ src/app/config/confparse.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug30894 b/changes/bug30894 new file mode 100644 index 000000000..64c14c4e6 --- /dev/null +++ b/changes/bug30894 @@ -0,0 +1,4 @@ + o Minor bugfixes (memory leaks): + - Fix a trivial memory leak when parsing an invalid value + from a download schedule in the configuration. Fixes bug + 30894; bugfix on 0.3.4.1-alpha. diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 8681f648d..729e7a447 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -225,6 +225,7 @@ config_assign_value(const config_format_t *fmt, void *options, tor_asprintf(msg, "Interval '%s %s' is malformed or out of bounds.", c->key, c->value); + tor_free(tmp); return -1; } *(int *)lvalue = i;

1 0

[tor/maint-0.4.1] Merge branch 'tor-github/pr/1114' into maint-0.4.1
by asn＠torproject.org 26 Jun '19

26 Jun '19

commit 00acccac644c20803d11ef7e162ae327eb834cf7 Merge: e4f66bf7f 4ab1d1c0c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 26 10:51:12 2019 +0300 Merge branch 'tor-github/pr/1114' into maint-0.4.1 changes/bug30894 | 4 ++++ src/app/config/confparse.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.4.1] Fix memleak when failing to parse a CSV_INTERVAL.
by asn＠torproject.org 26 Jun '19

26 Jun '19

commit 4ab1d1c0c44a887417b04fc75b1b11bf246f2bb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 15 16:47:16 2019 -0400 Fix memleak when failing to parse a CSV_INTERVAL. Fixes bug 30894; bugfix on 0.3.4.1-alpha --- changes/bug30894 | 4 ++++ src/app/config/confparse.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug30894 b/changes/bug30894 new file mode 100644 index 000000000..64c14c4e6 --- /dev/null +++ b/changes/bug30894 @@ -0,0 +1,4 @@ + o Minor bugfixes (memory leaks): + - Fix a trivial memory leak when parsing an invalid value + from a download schedule in the configuration. Fixes bug + 30894; bugfix on 0.3.4.1-alpha. diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 8681f648d..729e7a447 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -225,6 +225,7 @@ config_assign_value(const config_format_t *fmt, void *options, tor_asprintf(msg, "Interval '%s %s' is malformed or out of bounds.", c->key, c->value); + tor_free(tmp); return -1; } *(int *)lvalue = i;

1 0