]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Avoid a scan_build warning in dirvote_get_intermediate_param_value
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Jul 2017 15:07:30 +0000 (11:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Jul 2017 15:08:28 +0000 (11:08 -0400)
Fixes bug 21495.

src/or/dirvote.c

index f5e29eb78651741777fea9055bd409bd1f3007a6..11cd020d8898d9a7484933baa721783e34bbb360 100644 (file)
@@ -737,12 +737,12 @@ dirvote_get_intermediate_param_value(const smartlist_t *param_list,
     }
   } SMARTLIST_FOREACH_END(k_v_pair);
 
-  if (n_found == 1)
+  if (n_found == 1) {
     return value;
-  else if (BUG(n_found > 1))
-    return default_val;
-  else
+  } else {
+    tor_assert_nonfatal(n_found == 0);
     return default_val;
+  }
 }
 
 /** Minimum number of directory authorities voting for a parameter to