nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a segfault

Browse Source 
svn:r4191
This commit is contained in:
Nick Mathewson 2005-05-11 04:14:17 +00:00
parent dcc1b8a838
commit 776b411dc9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/or/connection_edge.c
View File

@ -915,16 +915,17 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
/* foo.exit -- modify conn->chosen_exit_node to specify the exit
* node, and conn->address to hold only the address portion.*/
char *s = strrchr(socks->address,'.');
if (s && s[1] != '\0') {
conn->chosen_exit_name = tor_strdup(s+1);
*s = 0;
} else if (s[1] == '\0') {
log_fn(LOG_WARN,"Malformed exit address '%s.exit'. Refusing.",
safe_str(socks->address));
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
return -1;
if (s) {
if (s[1] != '\0') {
conn->chosen_exit_name = tor_strdup(s+1);
*s = 0;
} else {
log_fn(LOG_WARN,"Malformed exit address '%s.exit'. Refusing.",
safe_str(socks->address));
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
return -1;
}
} else {
tor_assert(!s); /* address is of the form server.exit. */
struct in_addr in;
routerinfo_t *r = router_get_by_nickname(socks->address);
if (r) {