aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2016-08-20 03:57:32 +0000
committerAndrea Shepard <andrea@torproject.org>2016-08-20 03:57:32 +0000
commit3efe92ba58137022dd6c61cff9823813218a1a14 (patch)
tree74f4febb3370c643eeeda484c696335be2c3e329 /src/or/main.c
parent1a7709d40949b559a6f86e2bbcd1648eeeeed1af (diff)
downloadtor-3efe92ba58137022dd6c61cff9823813218a1a14.tar.gz
tor-3efe92ba58137022dd6c61cff9823813218a1a14.zip
Consider the case that a connection doesn't have a valid socket during OOS
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 6ab94f5e36..a1b5954aaf 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -662,7 +662,7 @@ connection_count_moribund, (void))
* runs next.
*/
SMARTLIST_FOREACH_BEGIN(closeable_connection_lst, connection_t *, conn) {
- if (connection_is_moribund(conn)) ++moribund;
+ if (SOCKET_OK(conn->s) && connection_is_moribund(conn)) ++moribund;
} SMARTLIST_FOREACH_END(conn);
return moribund;