[tor-commits] [tor/master] Fix a use-after-free in test_circuitlist.c

[nickm at torproject.org]

commit 98b1aad2018b572e19d2404ea7369afa2d0c4b05
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 18 09:46:39 2014 -0400

    Fix a use-after-free in test_circuitlist.c
    
    Found by clang-3.4 analyzers.
---
 src/test/test_circuitlist.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c
index 720b407..54aa51d 100644
--- a/src/test/test_circuitlist.c
+++ b/src/test/test_circuitlist.c
@@ -150,13 +150,13 @@ test_clist_maps(void *arg)
   tt_assert(! circuit_id_in_use_on_channel(100, ch1));
 
  done:
-  tor_free(ch1);
-  tor_free(ch2);
-  tor_free(ch3);
   if (or_c1)
     circuit_free(TO_CIRCUIT(or_c1));
   if (or_c2)
     circuit_free(TO_CIRCUIT(or_c2));
+  tor_free(ch1);
+  tor_free(ch2);
+  tor_free(ch3);
   UNMOCK(circuitmux_attach_circuit);
   UNMOCK(circuitmux_detach_circuit);
 }