summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Perry <mikeperry-git@torproject.org>2023-06-09 15:52:42 +0000
committerMike Perry <mikeperry-git@torproject.org>2023-06-09 16:29:10 +0000
commit6a513e2ff57545ad232ff8931b8902421b89c09b (patch)
tree721cc401c9ece2d8ee95d8f5692a58a4ea4b51dc
parentda50d21c42b43ede01bad48d205db67e6eed8bd2 (diff)
downloadtor-6a513e2ff57545ad232ff8931b8902421b89c09b.tar.gz
tor-6a513e2ff57545ad232ff8931b8902421b89c09b.zip
Bug 40801: Do not change read state of marked conns
-rw-r--r--src/core/or/relay.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index 247024ebc7..2c722f01cc 100644
--- a/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@ -3081,9 +3081,9 @@ set_block_state_for_streams(circuit_t *circ, edge_connection_t *stream_list,
if (stream_id && edge->stream_id != stream_id)
continue;
- if (!conn->read_event || edge->xoff_received) {
- /* This connection is a placeholder for something; probably a DNS
- * request. It can't actually stop or start reading.*/
+ if (!conn->read_event || edge->xoff_received ||
+ conn->marked_for_close) {
+ /* This connection should not start or stop reading. */
continue;
}