[tor-commits] [tor/master] Fix some 'dereference-before-null-check' warnings in test_circuitlist.c

[nickm at torproject.org]

commit c4d0d30bf3e621d5f7a7b27a7480bcdabe6274c6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 3 10:58:11 2014 -0400

    Fix some 'dereference-before-null-check' warnings in test_circuitlist.c
    
    Found by Coverity Scan.
    
    [CID 1234704, 1234705, 1234706]
---
 src/test/test_circuitlist.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c
index 97c6b98..53dcab3 100644
--- a/src/test/test_circuitlist.c
+++ b/src/test/test_circuitlist.c
@@ -79,6 +79,10 @@ test_clist_maps(void *arg)
   memset(&cam, 0, sizeof(cam));
   memset(&cdm, 0, sizeof(cdm));
 
+  tt_assert(ch1);
+  tt_assert(ch2);
+  tt_assert(ch3);
+
   ch1->cmux = tor_malloc(1);
   ch2->cmux = tor_malloc(1);
   ch3->cmux = tor_malloc(1);
@@ -161,7 +165,7 @@ test_clist_maps(void *arg)
   if (ch2)
     tor_free(ch2->cmux);
   if (ch3)
-  tor_free(ch3->cmux);
+    tor_free(ch3->cmux);
   tor_free(ch1);
   tor_free(ch2);
   tor_free(ch3);