[tor-commits] [tor/master] Fix a dumb C bug in the unit tests for 9841

[nickm at torproject.org]

commit 2f73525883373df17a7e11a8feae28f7558fe62e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 9 09:20:25 2014 -0400

    Fix a dumb C bug in the unit tests for 9841
    
    Fixes bug 11460; bug only affects unit tests and is not in any
    released version of Tor.
---
 src/test/test_circuitlist.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c
index 54c0c03..53cd415 100644
--- a/src/test/test_circuitlist.c
+++ b/src/test/test_circuitlist.c
@@ -177,7 +177,10 @@ test_rend_token_maps(void *arg)
   c3 = or_circuit_new(0, NULL);
   c4 = or_circuit_new(0, NULL);
 
-  tt_int_op(strlen((char*)tok1), ==, REND_TOKEN_LEN);
+  /* Make sure we really filled up the tok* variables */
+  tt_int_op(tok1[REND_TOKEN_LEN-1], ==, 'y');
+  tt_int_op(tok2[REND_TOKEN_LEN-1], ==, ' ');
+  tt_int_op(tok3[REND_TOKEN_LEN-1], ==, '.');
 
   /* No maps; nothing there. */
   tt_ptr_op(NULL, ==, circuit_get_rendezvous(tok1));