Fix a possible segfault when establishing an exit connection. Bugfix on 0.2.1.5-alpha.

svn:r17275

diff --git a/ChangeLog b/ChangeLog
index 15ddcdcdd8be8fafe7e8f98034dd61681a4bc047..cc68082edb26fe65e5dc720211f138fe47f5b56b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Changes in version 0.2.1.8-alpha - 2008-??-??
   o Major bugfixes:
     - Fix a DOS opportunity during the voting signature collection process
       at directory authorities. Spotted by rovv. Bugfix on 0.2.0.x.
+    - Fix a possible segfault when establishing an exit connection. Bugfix
+      on 0.2.1.5-alpha.
 
   o Minor bugfixes:
     - Get file locking working on win32.  Bugfix on 0.2.1.6-alpha.  Fixes

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index e060b6b42ddd959c153497a253efb6fc2921ed8f..97c995a340cd011fd7289ece0373c1cf291ded59 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -296,7 +296,6 @@ connection_edge_finished_flushing(edge_connection_t *conn)
 int
 connection_edge_finished_connecting(edge_connection_t *edge_conn)
 {
-  char valbuf[INET_NTOA_BUF_LEN];
   connection_t *conn;
 
   tor_assert(edge_conn);
@@ -305,7 +304,8 @@ connection_edge_finished_connecting(edge_connection_t *edge_conn)
   tor_assert(conn->state == EXIT_CONN_STATE_CONNECTING);
 
   log_info(LD_EXIT,"Exit connection to %s:%u (%s) established.",
-           escaped_safe_str(conn->address),conn->port,safe_str(valbuf));
+           escaped_safe_str(conn->address),conn->port,
+           fmt_addr(&conn->addr));
 
   conn->state = EXIT_CONN_STATE_OPEN;
   connection_watch_events(conn, EV_READ); /* stop writing, continue reading */