[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Short-term fix: prevent possible segfault in connection_clo...
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] Short-term fix: prevent possible segfault in connection_clo...
- From: nickm@xxxxxxxx (Nick Mathewson)
- Date: Fri, 1 Apr 2005 11:04:48 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Fri, 01 Apr 2005 11:05:14 -0500
- Reply-to: or-dev@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv22790/src/or
Modified Files:
connection_edge.c
Log Message:
Short-term fix: prevent possible segfault in connection_close_unattached_ap
Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- connection_edge.c 29 Mar 2005 05:27:32 -0000 1.313
+++ connection_edge.c 1 Apr 2005 16:04:45 -0000 1.314
@@ -38,7 +38,8 @@
// be defined yet. -RD
if (endreason == END_STREAM_REASON_ALREADY_SOCKS_REPLIED)
log_fn(LOG_WARN,"Bug: stream (marked at %s:%d) sending two socks replies?",
- conn->marked_for_close_file, conn->marked_for_close);
+ conn->marked_for_close_file?conn->marked_for_close_file:"",
+ conn->marked_for_close);
if (conn->socks_request->command == SOCKS_COMMAND_CONNECT)
connection_ap_handshake_socks_reply(conn, NULL, 0, socksreason);