sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If we start/stop reading on a dnsserv connection, don't assert. 

Fixes bug 16248. Patch from cypherpunks.  Bugfix on 0.2.0.1-alpha.
This commit is contained in:
Nick Mathewson 2016-03-11 10:33:19 -05:00
parent e4a42242ea
commit 650c03127a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/main.c
View File

@ -517,6 +517,12 @@ connection_stop_reading(connection_t *conn)
return;
});
/* if dummy conn then no socket and no event, nothing to do here */
if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) {
tor_assert(!conn->read_event);
return;
}
tor_assert(conn->read_event);
if (conn->linked) {
@ -542,6 +548,12 @@ connection_start_reading(connection_t *conn)
return;
});
/* if dummy conn then no socket and no event, nothing to do here */
if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) {
tor_assert(!conn->read_event);
return;
}
tor_assert(conn->read_event);
if (conn->linked) {