diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2010-11-24 07:50:29 -0800 |
|---|---|---|
| committer | Robert Ransom <rransom.8774@gmail.com> | 2010-11-24 13:18:11 -0800 |
| commit | de75afc5561fe931d1ff4d29ae629a92205154f0 (patch) | |
| tree | d825f17de20853770ac00a3ff4dfa03d2cb015d1 | |
| parent | 713db8dbfa172ea395ff3cee33fea875a052bd35 (diff) | |
| download | tor-de75afc5561fe931d1ff4d29ae629a92205154f0.tar.gz tor-de75afc5561fe931d1ff4d29ae629a92205154f0.zip | |
Avoid dereferencing NULL if a bridge fails to build an ei descriptor.
Reported by an anonymous commenter on Trac.
| -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, |