torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make an assert into a BUG warning in the bridge code

Browse Source 
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
This commit is contained in:
teor
2017-09-15 14:02:22 +10:00
parent d60e7df2da
commit 033691212a
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug23524
+4
View File
@@ -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.
src/or/bridges.c
+3 -1
View File
@@ -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;