diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-04-01 16:04:45 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-04-01 16:04:45 +0000 |
| commit | 0d6c9c47b31fe65c0b52b9a71e2b57824a1f9ee1 (patch) | |
| tree | 5752773ab1b120bf76f33bbcd3db55a28733c613 | |
| parent | 5de85f54ba0c0d21f99cc1e1053da6076eeae4e4 (diff) | |
| download | tor-0d6c9c47b31fe65c0b52b9a71e2b57824a1f9ee1.tar.gz tor-0d6c9c47b31fe65c0b52b9a71e2b57824a1f9ee1.zip | |
Short-term fix: prevent possible segfault in connection_close_unattached_ap
svn:r3970
| -rw-r--r-- | src/or/connection_edge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index d85e17b32d..f381f432e8 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -38,7 +38,8 @@ connection_close_unattached_ap(connection_t *conn, int endreason) { // 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); |