tor

commit e7463be39b25db8f682146a690a2f590ce0ca8c0
parent 83de46eb2536f17dbe6c96533e8751b5a1ebe984
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  9 Jul 2018 10:16:51 -0400

Merge branch 'maint-0.3.4'

Diffstat:
A
changes/bug26269
 | 
5
+++++
M
src/feature/relay/router.c
 | 
16
++++++++++------

2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/changes/bug26269 b/changes/bug26269
@@ -0,0 +1,5 @@
+  o Minor bugfixes (compilation):
+    - Fix a compilation warning on some versions of GCC when
+      building code that calls routerinfo_get_my_routerinfo() twice,
+      assuming that the second call will succeed if the first one did.
+      Fixes bug 26269; bugfix on 0.2.8.2-alpha.
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
@@ -2045,10 +2045,11 @@ router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port)
 MOCK_IMPL(int,
 router_my_exit_policy_is_reject_star,(void))
 {
-  if (!router_get_my_routerinfo()) /* make sure routerinfo exists */
+  const routerinfo_t *me = router_get_my_routerinfo();
+  if (!me) /* make sure routerinfo exists */
     return -1;
 
-  return router_get_my_routerinfo()->policy_is_reject_star;
+  return me->policy_is_reject_star;
 }
 
 /** Return true iff I'm a server and <b>digest</b> is equal to
@@ -2653,10 +2654,12 @@ check_descriptor_bandwidth_changed(time_t now)
 {
   static time_t last_changed = 0;
   uint64_t prev, cur;
-  if (!router_get_my_routerinfo())
+  const routerinfo_t *my_ri = router_get_my_routerinfo();
+  if (!my_ri) /* make sure routerinfo exists */
     return;
 
-  prev = router_get_my_routerinfo()->bandwidthcapacity;
+  prev = my_ri->bandwidthcapacity;
+
   /* Consider ourselves to have zero bandwidth if we're hibernating or
    * shutting down. */
   cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess();
@@ -2709,14 +2712,15 @@ check_descriptor_ipaddress_changed(time_t now)
   const or_options_t *options = get_options();
   const char *method = NULL;
   char *hostname = NULL;
+  const routerinfo_t *my_ri = router_get_my_routerinfo();
 
   (void) now;
 
-  if (router_get_my_routerinfo() == NULL)
+  if (my_ri == NULL) /* make sure routerinfo exists */
     return;
 
   /* XXXX ipv6 */
-  prev = router_get_my_routerinfo()->addr;
+  prev = my_ri->addr;
   if (resolve_my_address(LOG_INFO, options, &cur, &method, &hostname) < 0) {
     log_info(LD_CONFIG,"options->Address didn't resolve into an IP.");
     return;