tor

commit 033691212a49d3d32f8a684a493c8c11b8887eee
parent d60e7df2da5bfae62750bc4b41581d47e504e4bf
Author: teor <teor2345@gmail.com>
Date:   Fri, 15 Sep 2017 14:02:22 +1000

Make an assert into a BUG warning in the bridge code

If future code asks if there are any running bridges, without checking
if bridges are enabled, log a BUG warning rather than crashing.

Fixes 23524 on 0.3.0.1-alpha

Diffstat:
A
changes/bug23524
 | 
4
++++
M
src/or/bridges.c
 | 
4
+++-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changes/bug23524 b/changes/bug23524
@@ -0,0 +1,4 @@
+  o Minor bugfixes (DoS-resistance):
+    - If future code asks if there are any running bridges, without checking
+      if bridges are enabled, log a BUG warning rather than crashing.
+      Fixes 23524 on 0.3.0.1-alpha.
diff --git a/src/or/bridges.c b/src/or/bridges.c
@@ -836,7 +836,9 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache)
 MOCK_IMPL(int,
 any_bridge_descriptors_known, (void))
 {
-  tor_assert(get_options()->UseBridges);
+  if (BUG(!get_options()->UseBridges)) {
+    return 0;
+  }
 
   if (!bridge_list)
     return 0;