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

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

Browse Source 
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 17cfdb358c
commit e79da62645
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/main.c
+12
View File
@@ -578,6 +578,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) {
@@ -603,6 +609,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) {