[tor-commits] [tor/master] Add another cellintptr use; fixes 14031

nickm at torproject.org nickm at torproject.org
Sat Dec 27 00:17:30 UTC 2014


commit eda5cebd6c334c3e6fa82c6623f33592a8f77e60
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 26 19:17:24 2014 -0500

    Add another cellintptr use; fixes 14031
---
 src/test/test_channel.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/test_channel.c b/src/test/test_channel.c
index 59f4596..82a5f44 100644
--- a/src/test/test_channel.c
+++ b/src/test/test_channel.c
@@ -1406,6 +1406,7 @@ test_channel_queue_impossible(void *arg)
   ch->state = CHANNEL_STATE_MAINT;
   cell = tor_malloc_zero(sizeof(cell_t));
   make_fake_cell(cell);
+  cellintptr = (uintptr_t)(void*)cell;
   channel_write_cell(ch, cell);
 
   /* Check that it's queued */
@@ -1414,7 +1415,7 @@ test_channel_queue_impossible(void *arg)
   tt_assert(q);
   if (q) {
     tt_int_op(q->type, ==, CELL_QUEUE_FIXED);
-    tt_ptr_op(q->u.fixed.cell, ==, cell);
+    tt_assert((uintptr_t)q->u.fixed.cell == cellintptr);
   }
   /* Clobber it, including the queue entry type */
   tor_free(q->u.fixed.cell);



More information about the tor-commits mailing list