diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-24 17:02:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-24 17:02:22 -0500 |
| commit | 251b40f720d374918c4f453c73c2f59162757795 (patch) | |
| tree | ffef18e7065280828bc3fbe766672f698ca5b346 | |
| parent | e57cb6b9762a2f94818738b5790d09c292e1bc24 (diff) | |
| parent | de75afc5561fe931d1ff4d29ae629a92205154f0 (diff) | |
| download | tor-251b40f720d374918c4f453c73c2f59162757795.tar.gz tor-251b40f720d374918c4f453c73c2f59162757795.zip | |
Merge remote branch 'rransom/fix2195-fix' into maint-0.2.2
| -rw-r--r-- | changes/fix2195-fix | 6 | ||||
| -rw-r--r-- | src/or/router.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/fix2195-fix b/changes/fix2195-fix new file mode 100644 index 0000000000..9f03c2465e --- /dev/null +++ b/changes/fix2195-fix @@ -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. + diff --git a/src/or/router.c b/src/or/router.c index 3d4ee70399..66ef8ec52e 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -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, |