From 82fb40c8dc2f21753298559e79d898add80bf6b7 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 17 Dec 2018 09:26:57 -0500 Subject: [PATCH 1/4] Fix dead-assignment warnings in test_config.c Found by scan-build. --- src/test/test_config.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 5140c3c1a8..67a43d669e 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5783,6 +5783,7 @@ test_config_extended_fmt(void *arg) tt_str_op(lp->value, OP_EQ, "is back here"); tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL); lp = lp->next; + tt_assert(!lp); config_free_lines(lines); /* Try with the "extended" flag enabled. */ @@ -5809,6 +5810,7 @@ test_config_extended_fmt(void *arg) tt_str_op(lp->value, OP_EQ, ""); tt_int_op(lp->command, OP_EQ, CONFIG_LINE_CLEAR); lp = lp->next; + tt_assert(!lp); done: config_free_lines(lines); From f50558ce8ce33339b86ac642d92a27430e066d62 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 17 Dec 2018 09:27:40 -0500 Subject: [PATCH 2/4] Fix dead-assignment warning in test_shared_random.c --- src/test/test_shared_random.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 433661f128..16e28afafe 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -309,6 +309,7 @@ test_get_start_time_of_current_run(void *arg) retval = parse_rfc1123_time("Mon, 19 Apr 2015 23:00:00 UTC", &mock_consensus.valid_after); + tt_int_op(retval, OP_EQ, 0); retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:08:00 UTC", ¤t_time); From d58a597a55dba2ac468cbdef5172ecda1dc2344f Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 17 Dec 2018 09:28:08 -0500 Subject: [PATCH 3/4] Fix dead assignment warning in test_hs_service.c --- src/test/test_hs_service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index ee2d71aa75..79cbd2e5d4 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1396,7 +1396,6 @@ static void test_build_update_descriptors(void *arg) { int ret; - time_t now = time(NULL); node_t *node; hs_service_t *service; hs_service_intro_point_t *ip_cur, *ip_next; @@ -1422,7 +1421,8 @@ test_build_update_descriptors(void *arg) voting_schedule_recalculate_timing(get_options(), mock_ns.valid_after); update_approx_time(mock_ns.valid_after+1); - now = mock_ns.valid_after+1; + + time_t now = mock_ns.valid_after+1; /* Create a service without a current descriptor to trigger a build. */ service = helper_create_service(); From ce3d501040fb994bb3c7dd82b21e02648621d3f1 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 17 Dec 2018 09:28:24 -0500 Subject: [PATCH 4/4] Fix null-pointer-deref warning from scan-build in test_hs_service.c --- src/test/test_hs_service.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 79cbd2e5d4..b2aafc1cd6 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1654,6 +1654,9 @@ test_build_descriptors(void *arg) service->desc_current = NULL; build_all_descriptors(now); + tt_assert(service->desc_current); + tt_assert(service->desc_current->desc); + hs_desc_superencrypted_data_t *superencrypted; superencrypted = &service->desc_current->desc->superencrypted_data; tt_int_op(smartlist_len(superencrypted->clients), OP_EQ, 16);