[or-cvs] [tor/maint-0.2.2] Avoid dereferencing NULL if a bridge fails to build an ei descriptor.

[nickm at torproject.org]

Author: Robert Ransom <rransom.8774 at gmail.com>
Date: Wed, 24 Nov 2010 07:50:29 -0800
Subject: Avoid dereferencing NULL if a bridge fails to build an ei descriptor.
Commit: de75afc5561fe931d1ff4d29ae629a92205154f0

Reported by an anonymous commenter on Trac.
---
 changes/fix2195-fix |    6 ++++++
 src/or/router.c     |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)
 create mode 100644 changes/fix2195-fix

diff --git a/changes/fix2195-fix b/changes/fix2195-fix
new file mode 100644
index 0000000..9f03c24
--- /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 3d4ee70..66ef8ec 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,
-- 
1.7.1