nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 17:13:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow n_chan to be NULL in circuitmux_find_map_entry(); it can be but with non-NULL p_chan when extending a circuit

Browse Source
This commit is contained in:
Andrea Shepard 2012-10-01 14:55:33 -07:00
parent a0200c1f6e
commit 903cc8acd1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/or/circuitmux.c
View File

@ -655,15 +655,17 @@ circuitmux_find_map_entry(circuitmux_t *cmux, circuit_t *circ)
tor_assert(cmux); tor_assert(cmux);
tor_assert(cmux->chanid_circid_map); tor_assert(cmux->chanid_circid_map);
tor_assert(circ); tor_assert(circ);
tor_assert(circ->n_chan);
/* Okay, let's see if it's attached for n_chan/n_circ_id */ /* Check if we have n_chan */
search.chan_id = circ->n_chan->global_identifier; if (circ->n_chan) {
search.circ_id = circ->n_circ_id; /* Okay, let's see if it's attached for n_chan/n_circ_id */
search.chan_id = circ->n_chan->global_identifier;
search.circ_id = circ->n_circ_id;
/* Query */ /* Query */
hashent = HT_FIND(chanid_circid_muxinfo_map, cmux->chanid_circid_map, hashent = HT_FIND(chanid_circid_muxinfo_map, cmux->chanid_circid_map,
&search); &search);
}
/* Found something? */ /* Found something? */
if (hashent) { if (hashent) {