nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-22 05:54:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/56'

Browse Source
This commit is contained in:
David Goulet 2020-07-16 14:15:25 -04:00
commit b83c6ab737
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/feature/nodelist/nodelist.c
View File

@ -1988,6 +1988,12 @@ node_set_country(node_t *node)
else if (node->ri) else if (node->ri)
ipv4_addr = &node->ri->ipv4_addr; ipv4_addr = &node->ri->ipv4_addr;
/* IPv4 is mandatory for a relay so this should not happen unless we are
* attempting to set the country code on a node without a descriptor. */
if (BUG(!ipv4_addr)) {
node->country = -1;
return;
}
node->country = geoip_get_country_by_addr(ipv4_addr); node->country = geoip_get_country_by_addr(ipv4_addr);
} }