Prechádzať zdrojové kódy

Merge branch 'maint-0.3.0' into maint-0.3.1

Nick Mathewson 6 rokov pred
rodič
commit
fb5877b972
2 zmenil súbory, kde vykonal 8 pridanie a 0 odobranie
  1. 6 0
      changes/bug24736
  2. 2 0
      src/or/policies.c

+ 6 - 0
changes/bug24736

@@ -0,0 +1,6 @@
+  o Minor bugfixes (address selection):
+    - When the fascist_firewall_choose_address_ functions don't find a
+      reachable address, set the returned address to the null address and port.
+      This is a precautionary measure, because some callers do not check the
+      return value.
+      Fixes bug 24736; bugfix on 0.2.8.2-alpha.

+ 2 - 0
src/or/policies.c

@@ -865,6 +865,8 @@ fascist_firewall_choose_address_base(const tor_addr_t *ipv4_addr,
     ap->port = result->port;
     return 1;
   } else {
+    tor_addr_make_null(&ap->addr, AF_UNSPEC);
+    ap->port = 0;
     return 0;
   }
 }