tor

commit 3b960df4f9990355fc2514689280731c31551a4a
parent 103dd68ba8e1d0780dee1ef1c02ccd2ed6cc0542
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 28 Aug 2018 12:35:50 -0400

Merge branch 'bug26896_034'

Diffstat:
A
changes/bug26896
 | 
3
+++
M
src/feature/dircache/directory.c
 | 
3
+++

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/changes/bug26896 b/changes/bug26896
@@ -0,0 +1,3 @@
+  o Minor bugfixes (directory connection shutdown):
+    - Avoid a double-close when shutting down a stalled directory connection.
+      Fixes bug 26896; bugfix on 0.3.4.1-alpha.
diff --git a/src/feature/dircache/directory.c b/src/feature/dircache/directory.c
@@ -5210,6 +5210,9 @@ connection_dir_finished_flushing(dir_connection_t *conn)
   tor_assert(conn);
   tor_assert(conn->base_.type == CONN_TYPE_DIR);
 
+  if (conn->base_.marked_for_close)
+    return 0;
+
   /* Note that we have finished writing the directory response. For direct
    * connections this means we're done; for tunneled connections it's only
    * an intermediate step. */