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

Merge branch 'maint-0.4.1' into maint-0.4.2

Browse Source
This commit is contained in:
Nick Mathewson 2020-03-17 13:56:10 -04:00
commit 4ee2699416
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket33619 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes (circuit padding, memory leaks):
- Avoid a remotely triggered memory leak in the case that a circuit
padding machine is somehow negotiated twice on the same circuit. Fixes
bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls. This is
also tracked as TROVE-2020-004.

9
src/core/or/circuitpadding.c
View File

@ -2444,9 +2444,12 @@ circpad_setup_machine_on_circ(circuit_t *on_circ,
return; return;
} }
tor_assert_nonfatal(on_circ->padding_machine[machine->machine_index] IF_BUG_ONCE(on_circ->padding_machine[machine->machine_index] != NULL) {
== NULL); return;
tor_assert_nonfatal(on_circ->padding_info[machine->machine_index] == NULL); }
IF_BUG_ONCE(on_circ->padding_info[machine->machine_index] != NULL) {
return;
}
/* Log message */ /* Log message */
if (CIRCUIT_IS_ORIGIN(on_circ)) { if (CIRCUIT_IS_ORIGIN(on_circ)) {