tor

commit aa9561164a94c7ad8d61d3fdc153fac15d98143a
parent 4b24b3628926e864220d59b9d1b8c0dd45a1d52b
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 16 Jul 2020 13:18:53 -0400

nodelist: Fix possible NULL deref

Found by coverity with CID 1465290. Fix unreleased code.

Fixes #40049

Signed-off-by: David Goulet <dgoulet@torproject.org>

Diffstat:
M
src/feature/nodelist/nodelist.c
 | 
6
++++++

1 file changed, 6 insertions(+), 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);
 }