From b51d2c05a0ab2363b6a49c2451f0627696adff31 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Mon, 6 Oct 2003 21:22:12 +0000
Subject: [PATCH] no need to trigger an assert if socks handshake is malformed
svn:r542
---
src/or/connection_edge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 051ba16d9a..82336e5fa4 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -524,7 +524,7 @@ static int connection_ap_handshake_socks_reply(connection_t *conn, char *reply,
connection_write_to_buf(buf,10,conn);
return connection_flush_buf(conn); /* try to flush it */
}
- assert(0);
+ return 0; /* if socks_version isn't 4 or 5, don't send anything */
}
/*ENDCLOSE*/ static int connection_exit_begin_conn(cell_t *cell, circuit_t *circ) {
--
GitLab