tor

commit f288f2478a5d455cd151e8fd13fe3ed66dfd75e5
parent 8ed4f1ee8418eaafcb6314f093d1186d711a837e
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  2 Nov 2018 09:05:14 -0400

Merge branch 'bug26896_034' into maint-0.3.4

Diffstat:
A
changes/bug26896
 | 
3
+++
M
src/or/directory.c
 | 
4
+++-

2 files changed, 6 insertions(+), 1 deletion(-)
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/or/directory.c b/src/or/directory.c
@@ -5179,6 +5179,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. */
@@ -5912,4 +5915,3 @@ dir_split_resource_into_spoolable(const char *resource,
   smartlist_free(fingerprints);
   return r;
 }
-