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

Defensive programming: null [pn]_chan,circ_id in circuit_mark_for_close_

Browse Source 
Doing this as part of the patch for #9683 to prevent possible bugs
down the line
This commit is contained in:
Nick Mathewson 2014-03-12 10:57:08 -04:00
parent 1a74360c2d
commit d769cab3e5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/circuitlist.c
View File

@ -1594,6 +1594,7 @@ circuit_mark_for_close_, (circuit_t *circ, int reason, int line,
channel_send_destroy(circ->n_circ_id, circ->n_chan, reason); channel_send_destroy(circ->n_circ_id, circ->n_chan, reason);
} }
circuitmux_detach_circuit(circ->n_chan->cmux, circ); circuitmux_detach_circuit(circ->n_chan->cmux, circ);
circuit_set_n_circid_chan(circ, 0, NULL);
} }
if (! CIRCUIT_IS_ORIGIN(circ)) { if (! CIRCUIT_IS_ORIGIN(circ)) {
@ -1627,6 +1628,7 @@ circuit_mark_for_close_, (circuit_t *circ, int reason, int line,
channel_send_destroy(or_circ->p_circ_id, or_circ->p_chan, reason); channel_send_destroy(or_circ->p_circ_id, or_circ->p_chan, reason);
} }
circuitmux_detach_circuit(or_circ->p_chan->cmux, circ); circuitmux_detach_circuit(or_circ->p_chan->cmux, circ);
circuit_set_p_circid_chan(or_circ, 0, NULL);
} }
} else { } else {
origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ);