mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 18:22:09 +01:00
Code Issues Projects Releases Wiki Activity

r12317@catbus: nickm | 2007-04-09 15:50:51 -0400

Browse Source 
Fix second part of bug 411 (which was actually a separate bug): it isnt safe to clear a cell queue while the circuit is active.


svn:r9928
This commit is contained in:
Nick Mathewson 2007-04-09 20:09:26 +00:00
parent f36c613dbc
commit eb95ff9ba9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/circuitlist.c
View File

@ -398,19 +398,23 @@ circuit_free(circuit_t *circ)
other->rend_splice = NULL; other->rend_splice = NULL;
} }
cell_queue_clear(&ocirc->p_conn_cells);
tor_free(circ->onionskin); tor_free(circ->onionskin);
/* remove from map. */ /* remove from map. */
circuit_set_p_circid_orconn(ocirc, 0, NULL); circuit_set_p_circid_orconn(ocirc, 0, NULL);
}
cell_queue_clear(&circ->n_conn_cells); /* Clear cell queue _after_ removing it from the map. Otherwise our
* "active" checks will be violated. */
cell_queue_clear(&ocirc->p_conn_cells);
}
/* Remove from map. */ /* Remove from map. */
circuit_set_n_circid_orconn(circ, 0, NULL); circuit_set_n_circid_orconn(circ, 0, NULL);
/* Clear cell queue _after_ removing it from the map. Otherwise our
* "active" checks will be violated. */
cell_queue_clear(&circ->n_conn_cells);
memset(circ, 0xAA, sizeof(circuit_t)); /* poison memory */ memset(circ, 0xAA, sizeof(circuit_t)); /* poison memory */
tor_free(mem); tor_free(mem);
} }