From: Roger Dingledine <arma@torproject.org>
Date: Sun, 22 Nov 2009 04:02:10 +0000 (-0500)
Subject: clobber connections with different number than we clobber circuits
X-Git-Tag: tor-0.2.2.7-alpha~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f8b36a1e2dbcfeaf0c5c31a92aa0f26f365b890;p=thirdparty%2Ftor.git

clobber connections with different number than we clobber circuits
---

diff --git a/ChangeLog b/ChangeLog
index 3fa7b387e3..2b55d76839 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ Changes in version 0.2.2.7-alpha - 2009-??-??
   o Minor bugfixes:
     - Fix compilation on OSX 10.3, which has a stub mlockall() but
       hides it. Bugfix on 0.2.2.6-alpha.
+    - After we free an internal connection structure, overwrite it
+      with a different memory value than we use for overwriting a freed
+      internal circuit structure. Should help with debugging. Suggested
+      by bug 1055.
 
 
 Changes in version 0.2.2.6-alpha - 2009-11-19
diff --git a/src/or/connection.c b/src/or/connection.c
index 48740412c4..0600d9711f 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(mem, 0xAA, memlen); /* poison memory */
+  memset(mem, 0xCC, memlen); /* poison memory */
   tor_free(mem);
 }