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 | 698e4a4780a717083e713ee0cf1f3a744f7087d7 (patch) | |
| tree | 3bc545d22f2c4b717f6bba2e465004f8b844c848 | |
| parent | bcf033047d80214b453327532910969b72b72c05 (diff) | |
| parent | 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 (diff) | |
| download | tor-698e4a4780a717083e713ee0cf1f3a744f7087d7.tar.gz tor-698e4a4780a717083e713ee0cf1f3a744f7087d7.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -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 2aa6373f3e..da5c4af6dc 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; } } |