diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-09 15:29:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-09 15:29:57 -0400 |
| commit | 75a7997148c55515a5d1c029a0ab5b46341a4e18 (patch) | |
| tree | 4f924ebffc40392028686df2273915771e6f7aa6 | |
| parent | 4c55e8a58f41933e76bcb309206c98e7b5a1d834 (diff) | |
| download | tor-75a7997148c55515a5d1c029a0ab5b46341a4e18.tar.gz tor-75a7997148c55515a5d1c029a0ab5b46341a4e18.zip | |
Fix a coupole of coverity complaints.
| -rw-r--r-- | src/test/test_circuitlist.c | 6 | ||||
| -rw-r--r-- | src/test/test_relay.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index b233e99328..e996c42115 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -355,10 +355,8 @@ test_pick_circid(void *arg) } done: - if (chan1) - circuitmux_free(chan1->cmux); - if (chan2) - circuitmux_free(chan2->cmux); + circuitmux_free(chan1->cmux); + circuitmux_free(chan2->cmux); tor_free(chan1); tor_free(chan2); bitarray_free(ba); diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 29016e444b..4713c79ea5 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -113,11 +113,11 @@ test_relay_append_cell_to_circuit_queue(void *arg) done: tor_free(cell); - cell_queue_clear(&orcirc->base_.n_chan_cells); - cell_queue_clear(&orcirc->p_chan_cells); if (orcirc) { circuitmux_detach_circuit(nchan->cmux, TO_CIRCUIT(orcirc)); circuitmux_detach_circuit(pchan->cmux, TO_CIRCUIT(orcirc)); + cell_queue_clear(&orcirc->base_.n_chan_cells); + cell_queue_clear(&orcirc->p_chan_cells); } tor_free(orcirc); free_fake_channel(nchan); |