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

[tor/maint-0.3.4] Add changes file
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit ce9b9cc18d9cedd9144e86dcef48c6ae99abe7d5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 3 14:56:28 2018 +0300 Add changes file --- changes/bug26196 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug26196 b/changes/bug26196 new file mode 100644 index 000000000..e63f09a2d --- /dev/null +++ b/changes/bug26196 @@ -0,0 +1,7 @@ + o Minor bugfixes (testing, compilation): + - Refrain from trying to get an item from empty smartlist in + test_bridges_clear_bridge_list. Set DEBUG_SMARTLIST in unit + tests to catch improper smartlist usage. Furthermore, + enable DEBUG_SMARTLIST globally when build is configured + with fragile hardening. Fixes bug 26196; bugfix on + 0.3.4.1-alpha.

1 0

[tor/maint-0.3.4] Enable DEBUG_SMARTLIST for entire codebase when expensive hardening is on
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 9f2b887c5d251b93ee9def70871dfd71af71d995 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 3 14:48:20 2018 +0300 Enable DEBUG_SMARTLIST for entire codebase when expensive hardening is on --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 48ca5bae1..1b57361e0 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,7 @@ AC_ARG_ENABLE(fragile-hardening, AS_HELP_STRING(--enable-fragile-hardening, [enable more fragile and expensive compiler hardening; makes Tor slower])) if test "x$enable_expensive_hardening" = "xyes" || test "x$enable_fragile_hardening" = "xyes"; then fragile_hardening="yes" + AC_DEFINE(DEBUG_SMARTLIST, 1, [Enable smartlist debugging]) fi dnl Linker hardening options

1 0

[tor/maint-0.3.4] Merge branch 'rl1987_bug26196_rebased_034' into maint-0.3.4
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 38cb638c325bc2612befc8176c545b1bcae9834f Merge: ac1747e47 ce9b9cc18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 07:50:00 2018 -0400 Merge branch 'rl1987_bug26196_rebased_034' into maint-0.3.4 changes/bug26196 | 7 +++++++ configure.ac | 1 + src/test/test.h | 2 ++ src/test/test_bridges.c | 6 +----- 4 files changed, 11 insertions(+), 5 deletions(-)

1 0

[tor/master] Enable DEBUG_SMARTLIST in unit tests
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 9054ccb36b9b4bedf5991b00a4a8bfedb28c64f0 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 3 14:33:31 2018 +0300 Enable DEBUG_SMARTLIST in unit tests --- src/test/test.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test.h b/src/test/test.h index 3095d54e3..63b2b3074 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -11,6 +11,8 @@ * \brief Macros and functions used by unit tests. */ +#define DEBUG_SMARTLIST 1 + #include "compat.h" #include "tinytest.h" #define TT_EXIT_TEST_FUNCTION STMT_BEGIN goto done; STMT_END

1 0

[tor/master] Add changes file
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit ce9b9cc18d9cedd9144e86dcef48c6ae99abe7d5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 3 14:56:28 2018 +0300 Add changes file --- changes/bug26196 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug26196 b/changes/bug26196 new file mode 100644 index 000000000..e63f09a2d --- /dev/null +++ b/changes/bug26196 @@ -0,0 +1,7 @@ + o Minor bugfixes (testing, compilation): + - Refrain from trying to get an item from empty smartlist in + test_bridges_clear_bridge_list. Set DEBUG_SMARTLIST in unit + tests to catch improper smartlist usage. Furthermore, + enable DEBUG_SMARTLIST globally when build is configured + with fragile hardening. Fixes bug 26196; bugfix on + 0.3.4.1-alpha.

1 0

[tor/release-0.3.4] Refrain from accessing empty smartlist in test_bridges_clear_bridge_list
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 7bb3777dfbfe796fa4e430b18fd2ddfbba85b743 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 3 13:34:24 2018 +0300 Refrain from accessing empty smartlist in test_bridges_clear_bridge_list Just check that smartlist length is zero instead --- src/test/test_bridges.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c index c4a4cacd9..c44f791e0 100644 --- a/src/test/test_bridges.c +++ b/src/test/test_bridges.c @@ -140,7 +140,6 @@ test_bridges_clear_bridge_list(void *arg) const smartlist_t *bridgelist; const smartlist_t *bridgelist_after; const bridge_info_t *bridge; - const bridge_info_t *bridge_after; helper_add_bridges_to_bridgelist(arg); bridgelist = bridge_list_get(); @@ -152,10 +151,7 @@ test_bridges_clear_bridge_list(void *arg) clear_bridge_list(); bridgelist_after = bridge_list_get(); tt_ptr_op(bridgelist_after, OP_NE, NULL); - - bridge_after = smartlist_get(bridgelist, 0); - // There now shouldn't be a first bridge - tt_ptr_op(bridge_after, OP_EQ, NULL); + tt_int_op(smartlist_len(bridgelist_after), OP_EQ, 0); done: return;

1 0

[tor/release-0.3.4] Enable DEBUG_SMARTLIST in unit tests
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 9054ccb36b9b4bedf5991b00a4a8bfedb28c64f0 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 3 14:33:31 2018 +0300 Enable DEBUG_SMARTLIST in unit tests --- src/test/test.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test.h b/src/test/test.h index 3095d54e3..63b2b3074 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -11,6 +11,8 @@ * \brief Macros and functions used by unit tests. */ +#define DEBUG_SMARTLIST 1 + #include "compat.h" #include "tinytest.h" #define TT_EXIT_TEST_FUNCTION STMT_BEGIN goto done; STMT_END

1 0

[tor/master] Merge branch 'rl1987_bug26196_rebased_034' into maint-0.3.4
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 38cb638c325bc2612befc8176c545b1bcae9834f Merge: ac1747e47 ce9b9cc18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 07:50:00 2018 -0400 Merge branch 'rl1987_bug26196_rebased_034' into maint-0.3.4 changes/bug26196 | 7 +++++++ configure.ac | 1 + src/test/test.h | 2 ++ src/test/test_bridges.c | 6 +----- 4 files changed, 11 insertions(+), 5 deletions(-)

1 0

[tor/master] Enable DEBUG_SMARTLIST for entire codebase when expensive hardening is on
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 9f2b887c5d251b93ee9def70871dfd71af71d995 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 3 14:48:20 2018 +0300 Enable DEBUG_SMARTLIST for entire codebase when expensive hardening is on --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 48ca5bae1..1b57361e0 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,7 @@ AC_ARG_ENABLE(fragile-hardening, AS_HELP_STRING(--enable-fragile-hardening, [enable more fragile and expensive compiler hardening; makes Tor slower])) if test "x$enable_expensive_hardening" = "xyes" || test "x$enable_fragile_hardening" = "xyes"; then fragile_hardening="yes" + AC_DEFINE(DEBUG_SMARTLIST, 1, [Enable smartlist debugging]) fi dnl Linker hardening options

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 5acbcf150e7c75f0a9bf6e9d8a4f6f5bec7d549a Merge: 152e4a1e5 38cb638c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 07:53:22 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26196 | 7 +++++++ configure.ac | 1 + src/test/test.h | 2 ++ src/test/test_bridges.c | 6 +----- 4 files changed, 11 insertions(+), 5 deletions(-)

1 0