Merge branch 'tor-gitlab/mr/56'

torproject · Jul 16, 2020 · b83c6ab · b83c6ab
2 parents e66eba6 + aa95611
commit b83c6ab
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
@@ -1988,6 +1988,12 @@ node_set_country(node_t *node)
   else if (node->ri)
     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);
 }