Commit e4045953 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

contribs: microdns: Fix a potential null dereference

Fix #19875

(cherry picked from commit 9c65322c)
Signed-off-by: 's avatarHugo Beauzée-Luyssen <hugo@beauzee.fr>
parent 28927ec1
From efdf2754f9f8b801048b8fdae2b269f091128193 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Thu, 1 Mar 2018 02:58:13 +0100
Subject: [PATCH] Fix more of the same crash
---
src/mdns.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/mdns.c b/src/mdns.c
index 132beef..55c5cb4 100644
--- a/src/mdns.c
+++ b/src/mdns.c
@@ -117,7 +117,9 @@ mdns_list_interfaces(multicast_if** pp_intfs, size_t* p_nb_intf, int ai_family)
return (MDNS_ERROR);
}
for (c = ifs; c != NULL; c = c->ifa_next) {
- if (c->ifa_addr->sa_family != ai_family || !mdns_is_interface_valuable(c))
+ if (c->ifa_addr == NULL ||
+ c->ifa_addr->sa_family != ai_family ||
+ !mdns_is_interface_valuable(c))
continue;
memcpy(intfs, c->ifa_addr, sizeof(*intfs));
intfs++;
--
2.11.0
......@@ -19,6 +19,7 @@ $(TARBALLS)/microdns-$(LIBMICRODNS_VERSION).tar.gz:
microdns: microdns-$(LIBMICRODNS_VERSION).tar.gz .sum-microdns
$(UNPACK)
$(APPLY) $(SRC)/microdns/fix-null-deref.patch
$(MOVE)
.microdns: microdns
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment