aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_circuitlist.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2017-04-17 16:36:55 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2017-04-17 16:36:55 +0300
commit0c39cefc5207cabcd648201f69899574b6844007 (patch)
treea8304c909d98aba52261bdd47f773c57068f5bf8 /src/test/test_circuitlist.c
parenta3ce303432f35a6f06f63f0679b9bb577f88dc3c (diff)
downloadtor-0c39cefc5207cabcd648201f69899574b6844007.tar.gz
tor-0c39cefc5207cabcd648201f69899574b6844007.zip
prop224 tests: Remove useless NULL check before circuit_free().
Addresses coverity issue CID 1405130.
Diffstat (limited to 'src/test/test_circuitlist.c')
-rw-r--r--src/test/test_circuitlist.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c
index 520aaf3c59..344ab27921 100644
--- a/src/test/test_circuitlist.c
+++ b/src/test/test_circuitlist.c
@@ -388,6 +388,7 @@ test_hs_circuitmap_isolation(void *arg)
const uint8_t tok1[REND_TOKEN_LEN] = "bet i got some of th";
circ1 = or_circuit_new(0, NULL);
+ tt_assert(circ1);
circ1->base_.purpose = CIRCUIT_PURPOSE_REND_POINT_WAITING;
/* check that circuitmap is empty right? */
@@ -408,10 +409,13 @@ test_hs_circuitmap_isolation(void *arg)
const uint8_t tok2[REND_TOKEN_LEN] = "you dont know anythi";
circ2 = origin_circuit_new();
+ tt_assert(circ2);
circ2->base_.purpose = CIRCUIT_PURPOSE_S_ESTABLISH_INTRO;
circ3 = or_circuit_new(0, NULL);
+ tt_assert(circ3);
circ3->base_.purpose = CIRCUIT_PURPOSE_INTRO_POINT;
circ4 = origin_circuit_new();
+ tt_assert(circ4);
circ4->base_.purpose = CIRCUIT_PURPOSE_S_ESTABLISH_INTRO;
/* Register circ2 with tok2 as service-side intro v2 circ */
@@ -437,14 +441,10 @@ test_hs_circuitmap_isolation(void *arg)
}
done:
- if (circ1)
- circuit_free(TO_CIRCUIT(circ1));
- if (circ2)
- circuit_free(TO_CIRCUIT(circ2));
- if (circ3)
- circuit_free(TO_CIRCUIT(circ3));
- if (circ4)
- circuit_free(TO_CIRCUIT(circ4));
+ circuit_free(TO_CIRCUIT(circ1));
+ circuit_free(TO_CIRCUIT(circ2));
+ circuit_free(TO_CIRCUIT(circ3));
+ circuit_free(TO_CIRCUIT(circ4));
}
struct testcase_t circuitlist_tests[] = {