From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 10 Jul 2008 18:31:28 +0000 (+0000)
Subject:  r16881@tombo:  nickm | 2008-07-10 14:19:21 -0400
X-Git-Tag: tor-0.2.1.3-alpha~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c717e19a295529e7fee014153ed0adadb2dfeb9d;p=thirdparty%2Ftor.git

 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 af096ae5c1..3d61fa5d11 100644
--- 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 */