diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-23 08:53:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-23 08:53:25 -0400 |
| commit | bea47fde59e7748557c9d55473988141fa6420c1 (patch) | |
| tree | b3e5b4f8c7c17e9900e1443a0b8bc3f749fa59b8 | |
| parent | 78b827467903905584156ee733b92a62c70b757e (diff) | |
| parent | 74e8fd22c9971a7184d74d2775ca1c575e54e08f (diff) | |
| download | tor-bea47fde59e7748557c9d55473988141fa6420c1.tar.gz tor-bea47fde59e7748557c9d55473988141fa6420c1.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -rw-r--r-- | changes/bug23690 | 5 | ||||
| -rw-r--r-- | src/or/circuitlist.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug23690 b/changes/bug23690 new file mode 100644 index 0000000000..36ff32e499 --- /dev/null +++ b/changes/bug23690 @@ -0,0 +1,5 @@ + o Major bugfixes (relay, crash, assertion failure): + - Fix a timing-based assertion failure that could occur when the + circuit out-of-memory handler freed a connection's output buffer. + Fixes bug 23690; bugfix on 0.2.6.1-alpha. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 54a7db9dbf..8d6a4a7cc2 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1986,6 +1986,7 @@ single_conn_free_bytes(connection_t *conn) if (conn->outbuf) { result += buf_allocation(conn->outbuf); buf_clear(conn->outbuf); + conn->outbuf_flushlen = 0; } if (conn->type == CONN_TYPE_DIR) { dir_connection_t *dir_conn = TO_DIR_CONN(conn); |