mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-20 13:06:20 +02:00
Merge branch 'bug23690_028'
This commit is contained in:
commit
8ccefa7b7a
5
changes/bug23690
Normal file
5
changes/bug23690
Normal file
@ -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.
|
||||||
|
|
@ -2122,6 +2122,7 @@ single_conn_free_bytes(connection_t *conn)
|
|||||||
if (conn->outbuf) {
|
if (conn->outbuf) {
|
||||||
result += buf_allocation(conn->outbuf);
|
result += buf_allocation(conn->outbuf);
|
||||||
buf_clear(conn->outbuf);
|
buf_clear(conn->outbuf);
|
||||||
|
conn->outbuf_flushlen = 0;
|
||||||
}
|
}
|
||||||
if (conn->type == CONN_TYPE_DIR) {
|
if (conn->type == CONN_TYPE_DIR) {
|
||||||
dir_connection_t *dir_conn = TO_DIR_CONN(conn);
|
dir_connection_t *dir_conn = TO_DIR_CONN(conn);
|
||||||
|
Loading…
Reference in New Issue
Block a user