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 | b68de63eb614061b33a84feb61804745b397a87d (patch) | |
| tree | e3fbbb03af3c336fe035ebfc1fd60fea124c4566 | |
| parent | 9120ac2218cd7872b7065ab829f061a6287941c2 (diff) | |
| parent | 74e8fd22c9971a7184d74d2775ca1c575e54e08f (diff) | |
| download | tor-b68de63eb614061b33a84feb61804745b397a87d.tar.gz tor-b68de63eb614061b33a84feb61804745b397a87d.zip | |
Merge branch 'maint-0.3.0' into maint-0.3.1
| -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 86b0aa097a..6ffaabc16f 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -2028,6 +2028,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); |