torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug3270' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson
2011-05-30 14:49:49 -04:00
parent 6802499413 cfeafe5e77
commit da7c60dcf3
16 changed files with 120 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/control.c
+1 -1
View File
@@ -1512,7 +1512,7 @@ getinfo_helper_listeners(control_connection_t *control_conn,
struct sockaddr_storage ss;
socklen_t ss_len = sizeof(ss);
if (conn->type != type || conn->marked_for_close || conn->s < 0)
if (conn->type != type || conn->marked_for_close || !SOCKET_OK(conn->s))
continue;
if (getsockname(conn->s, (struct sockaddr *)&ss, &ss_len) < 0) {