[tor-commits] [tor/master] scan-build: Be consistent with a needless check in circuitmux.c

[nickm at torproject.org]

commit 710649257176a35b28c0ca5f2b823d39e011350c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 18 20:33:47 2014 -0400

    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)
---
 src/or/circuitmux.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c
index 2d05c74..52ebfef 100644
--- a/src/or/circuitmux.c
+++ b/src/or/circuitmux.c
@@ -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);
   while (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 */
       chan = channel_find_by_global_id(to_remove->chan_id);
       if (chan) {