diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-11 16:06:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-11 16:06:02 -0500 |
| commit | fd8ef8dc573e0d20141fbd352a24a8c7fd0e305b (patch) | |
| tree | fdce5ee691deea9f8fe30103c842732d44d4539f | |
| parent | 43d2f99d54d92234615d68935661787d14a89688 (diff) | |
| parent | e3578d52e4d32483422cb867786373c2b7b493b5 (diff) | |
| download | tor-fd8ef8dc573e0d20141fbd352a24a8c7fd0e305b.tar tor-fd8ef8dc573e0d20141fbd352a24a8c7fd0e305b.tar.gz | |
Merge remote-tracking branch 'public/bug8208'
| -rw-r--r-- | changes/bug8208 | 4 | ||||
| -rw-r--r-- | src/or/router.c | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/changes/bug8208 b/changes/bug8208 new file mode 100644 index 000000000..c85db90b5 --- /dev/null +++ b/changes/bug8208 @@ -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. diff --git a/src/or/router.c b/src/or/router.c index f336f128d..899246f85 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -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, |