From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 17 Apr 2014 05:03:10 +0000 (-0400)
Subject: Fix uninitialized-ram free in unit tests
X-Git-Tag: tor-0.2.5.4-alpha~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0175fcaf7c6284f8961e112fab80beb4257f0faf;p=thirdparty%2Ftor.git

Fix uninitialized-ram free in unit tests

Fix on fb595922; bug not in any released Tor. Found with
--enable-expensive-hardening.
---

diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c
index 53cd41591f..ad8d0ac3af 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[] = {