[tor-commits] [tor/master] Fix uninitialized-ram free in unit tests

[nickm at torproject.org]

commit 0175fcaf7c6284f8961e112fab80beb4257f0faf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 17 01:03:10 2014 -0400

    Fix uninitialized-ram free in unit tests
    
    Fix on fb595922; bug not in any released Tor. Found with
    --enable-expensive-hardening.
---
 src/test/test_circuitlist.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c
index 53cd415..ad8d0ac 100644
--- a/src/test/test_circuitlist.c
+++ b/src/test/test_circuitlist.c
@@ -247,10 +247,14 @@ test_rend_token_maps(void *arg)
   tt_ptr_op(NULL, ==, circuit_get_intro_point(tok3));
 
  done:
-  circuit_free(TO_CIRCUIT(c1));
-  circuit_free(TO_CIRCUIT(c2));
-  circuit_free(TO_CIRCUIT(c3));
-  circuit_free(TO_CIRCUIT(c4));
+  if (c1)
+    circuit_free(TO_CIRCUIT(c1));
+  if (c2)
+    circuit_free(TO_CIRCUIT(c2));
+  if (c3)
+    circuit_free(TO_CIRCUIT(c3));
+  if (c4)
+    circuit_free(TO_CIRCUIT(c4));
 }
 
 struct testcase_t circuitlist_tests[] = {