diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-02 09:05:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-02 09:05:18 -0400 |
| commit | 1c5e7430efbc3bb03596957d454c9ff6825de67b (patch) | |
| tree | b132db61729ca039b2f4aa971984d0fb5a4793f2 | |
| parent | 1ace56149546e7f99a205b14e5086f8924102ae5 (diff) | |
| parent | f288f2478a5d455cd151e8fd13fe3ed66dfd75e5 (diff) | |
| download | tor-1c5e7430efbc3bb03596957d454c9ff6825de67b.tar.gz tor-1c5e7430efbc3bb03596957d454c9ff6825de67b.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -rw-r--r-- | changes/bug26896 | 3 | ||||
| -rw-r--r-- | src/or/directory.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug26896 b/changes/bug26896 new file mode 100644 index 0000000000..9762dc7fac --- /dev/null +++ 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 index e763de268f..ca53756cbe 100644 --- 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; } - |