[or-cvs] [tor/master] stop assuming that our downcasts have a struct offset of 0

[arma at seul.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Sat, 21 Nov 2009 22:59:18 -0500
Subject: stop assuming that our downcasts have a struct offset of 0
Commit: 7b6b931ccc6af626493beacdfefa3e114eb8bc7c

shouldn't actually change anything, but who knows.
---
 src/or/circuitlist.c |    2 +-
 src/or/connection.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 560bec5..3efeabe 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -504,7 +504,7 @@ circuit_free(circuit_t *circ)
    * "active" checks will be violated. */
   cell_queue_clear(&circ->n_conn_cells);
 
-  memset(circ, 0xAA, memlen); /* poison memory */
+  memset(mem, 0xAA, memlen); /* poison memory */
   tor_free(mem);
 }
 
diff --git a/src/or/connection.c b/src/or/connection.c
index aca9b8b..4874041 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -423,7 +423,7 @@ _connection_free(connection_t *conn)
     connection_or_remove_from_identity_map(TO_OR_CONN(conn));
   }
 
-  memset(conn, 0xAA, memlen); /* poison memory */
+  memset(mem, 0xAA, memlen); /* poison memory */
   tor_free(mem);
 }
 
-- 
1.5.6.5