mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
scan-build: Be consistent with a needless check in circuitmux.c
In circuitmux_detach_all_circuits, we check whether an HT iterator
gives us NULL. That should be impossible for an HT iterator. But
our checking it has confused scan-build (justly) into thinking that
our later use of HT_NEXT_RMV might not be kosher. I'm taking the
coward's route here and strengthening the check. Bugfix on
fd31dd44
. (Not a real bug though)
This commit is contained in:
parent
69ea4450ca
commit
7106492571
@ -412,7 +412,11 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux, smartlist_t *detached_out)
|
|||||||
i = HT_START(chanid_circid_muxinfo_map, cmux->chanid_circid_map);
|
i = HT_START(chanid_circid_muxinfo_map, cmux->chanid_circid_map);
|
||||||
while (i) {
|
while (i) {
|
||||||
to_remove = *i;
|
to_remove = *i;
|
||||||
if (to_remove) {
|
|
||||||
|
if (! to_remove) {
|
||||||
|
log_warn(LD_BUG, "Somehow, an HT iterator gave us a NULL pointer.");
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
/* Find a channel and circuit */
|
/* Find a channel and circuit */
|
||||||
chan = channel_find_by_global_id(to_remove->chan_id);
|
chan = channel_find_by_global_id(to_remove->chan_id);
|
||||||
if (chan) {
|
if (chan) {
|
||||||
|
Loading…
Reference in New Issue
Block a user