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

Merge remote-tracking branch 'public/bug8208'

Browse Source
This commit is contained in:
Nick Mathewson 2013-02-11 16:06:02 -05:00
commit fd8ef8dc57
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug8208 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Avoid a crash if we fail to generate an extrinfo descriptor.
Fixes bug 8208; bugfix on 0.2.3.16-alpha. Found by Coverity;
this is CID 718634.

8
src/or/router.c
View File

@ -1942,9 +1942,13 @@ router_rebuild_descriptor(int force)
anyway, since they don't have a DirPort, and always connect to the
bridge authority anonymously. But just in case they somehow think of
sending them on an unencrypted connection, don't allow them to try. */
ri->cache_info.send_unencrypted = ei->cache_info.send_unencrypted = 0;
ri->cache_info.send_unencrypted = 0;
if (ei)
ei->cache_info.send_unencrypted = 0
} else {
ri->cache_info.send_unencrypted = ei->cache_info.send_unencrypted = 1;
ri->cache_info.send_unencrypted = 1;
if (ei)
ei->cache_info.send_unencrypted = 1;
}
router_get_router_hash(ri->cache_info.signed_descriptor_body,