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

Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source
This commit is contained in:
Nick Mathewson 2012-09-12 11:11:16 -04:00
commit 35e19b9498
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug6341 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes:
- Fix a possible crash bug when checking for deactivated circuits
in connection_or_flush_from_first_active_circuit(). Fixes bug
6341; bugfix on 0.2.2.7-alpha. Bug report and fix received
pseudonymously.

2
src/or/relay.c
View File

@ -2480,7 +2480,7 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max,
tor_assert(tmp == cell_ewma); tor_assert(tmp == cell_ewma);
add_cell_ewma_to_conn(conn, cell_ewma); add_cell_ewma_to_conn(conn, cell_ewma);
} }
if (circ != conn->active_circuits) { if (!ewma_enabled && circ != conn->active_circuits) {
/* If this happens, the current circuit just got made inactive by /* If this happens, the current circuit just got made inactive by
* a call in connection_write_to_buf(). That's nothing to worry about: * a call in connection_write_to_buf(). That's nothing to worry about:
* circuit_make_inactive_on_conn() already advanced conn->active_circuits * circuit_make_inactive_on_conn() already advanced conn->active_circuits