r16881@tombo: nickm | 2008-07-10 14:19:21 -0400

 fix a rare segfault in bw-share-measuring code

svn:r15820

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index af096ae5c1f54262b537610d8676dfcc833c6055..3d61fa5d117413ce39ba177ac979f7e921e26843 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -875,8 +875,10 @@ router_get_my_share_of_directory_requests(double *v2_share_out,
   routerstatus_t *rs;
   const int pds_flags = PDS_ALLOW_SELF|PDS_IGNORE_FASCISTFIREWALL;
   *v2_share_out = *v3_share_out = 0.0;
+  if (!me)
+    return -1;
   rs = router_get_consensus_status_by_id(me->cache_info.identity_digest);
-  if (!me || !rs)
+  if (!rs)
     return -1;
 
   /* Calling for side effect */