nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'rransom/fix2195-fix' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2010-11-24 17:02:22 -05:00
commit 251b40f720
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/fix2195-fix Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes:
- Do not dereference NULL if a bridge fails to build its
extra-info descriptor. Previously, we would have dereferenced
NULL. Found by an anonymous commenter on Trac. Bugfix on
0.2.2.19-alpha.

2
src/or/router.c
View File

@ -1523,7 +1523,7 @@ router_rebuild_descriptor(int force)
/* Let bridges serve their own descriptors unencrypted, so they can
* pass reachability testing. (If they want to be harder to notice,
* they can always leave the DirPort off). */
if (!options->BridgeRelay)
if (ei && !options->BridgeRelay)
ei->cache_info.send_unencrypted = 1;
router_get_router_hash(ri->cache_info.signed_descriptor_body,