From ebd20109f0e3668c52d4184cf2cc1993f8a6134d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Fri, 19 Mar 2021 15:15:18 +0100 Subject: [PATCH] Check if ifa_addr field is null. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This field can be null. See e.g. https://man7.org/linux/man-pages/man3/getifaddrs.3.html Bug: webrtc:12523 Change-Id: I63ba297d0c57b3b70c545d1434716094d8ce20a4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/212601 Reviewed-by: Harald Alvestrand Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/master@{#33517} --- rtc_base/net_helpers.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtc_base/net_helpers.cc b/rtc_base/net_helpers.cc index e51a51a257..bec854af03 100644 --- a/rtc_base/net_helpers.cc +++ b/rtc_base/net_helpers.cc @@ -53,7 +53,7 @@ bool HasIPv4Enabled() { return false; } for (struct ifaddrs* cur = ifa; cur != nullptr; cur = cur->ifa_next) { - if (cur->ifa_addr->sa_family == AF_INET) { + if (cur->ifa_addr != nullptr && cur->ifa_addr->sa_family == AF_INET) { has_ipv4 = true; break; } @@ -112,7 +112,7 @@ bool HasIPv6Enabled() { return false; } for (struct ifaddrs* cur = ifa; cur != nullptr; cur = cur->ifa_next) { - if (cur->ifa_addr->sa_family == AF_INET6) { + if (cur->ifa_addr != nullptr && cur->ifa_addr->sa_family == AF_INET6) { has_ipv6 = true; break; }