diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-01-02 10:10:28 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-01-02 10:10:28 -0500 |
commit | fd46d8d0ad9e976cdae7676e9f27f572b78ac959 (patch) | |
tree | 5a5a32850cc8f0d45ae04acf1f5550824d5c675e | |
parent | 11336cfa0997709176bc912fde71338eaeab3851 (diff) | |
parent | 707076002d4db2b8b2e6f05bea86316674bf9f45 (diff) | |
download | tor-fd46d8d0ad9e976cdae7676e9f27f572b78ac959.tar.gz tor-fd46d8d0ad9e976cdae7676e9f27f572b78ac959.zip |
Merge branch 'maint-0.3.2' into release-0.3.2
-rw-r--r-- | changes/bug24736 | 6 | ||||
-rw-r--r-- | src/or/policies.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug24736 b/changes/bug24736 new file mode 100644 index 0000000000..632560932a --- /dev/null +++ b/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. diff --git a/src/or/policies.c b/src/or/policies.c index 78451db8fc..3bfea3a57c 100644 --- a/src/or/policies.c +++ b/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; } } |