nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug26896_034' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-11-02 09:05:14 -04:00
commit f288f2478a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug26896 Normal file
View File

@ -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.

4
src/or/directory.c
View File

@ -5179,6 +5179,9 @@ connection_dir_finished_flushing(dir_connection_t *conn)
tor_assert(conn); tor_assert(conn);
tor_assert(conn->base_.type == CONN_TYPE_DIR); 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 /* Note that we have finished writing the directory response. For direct
* connections this means we're done; for tunneled connections it's only * connections this means we're done; for tunneled connections it's only
* an intermediate step. */ * an intermediate step. */
@ -5912,4 +5915,3 @@ dir_split_resource_into_spoolable(const char *resource,
smartlist_free(fingerprints); smartlist_free(fingerprints);
return r; return r;
} }