nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.1' into maint-0.3.2

Browse Source
This commit is contained in:
Nick Mathewson 2018-01-02 10:10:28 -05:00
commit 707076002d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug24736 Normal file
View File

@ -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
src/or/policies.c
View File

@ -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;
}
}