From 6d7951c02231cc86006938bc01d23a5ac8b9c013 Mon Sep 17 00:00:00 2001 From: Karsten Loesing Date: Sun, 16 Nov 2008 01:52:44 +0000 Subject: [PATCH] Fix a possible segfault when establishing an exit connection. Bugfix on 0.2.1.5-alpha. svn:r17275 --- ChangeLog | 2 ++ src/or/connection_edge.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15ddcdcdd8..cc68082edb 100644 --- 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 e060b6b42d..97c995a340 100644 --- 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 */