vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Mar 1 17:58:24 2018 +0100| [9c65322c95d0966ce0897ddb24591937d5e7250c] | committer: Hugo Beauzée-Luyssen
contribs: microdns: Fix a potential null dereference
Fix #19875
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9c65322c95d0966ce0897ddb24591937d5e7250c
---
contrib/src/microdns/fix-null-deref.patch | 27 +++++++++++++++++++++++++++
contrib/src/microdns/rules.mak | 1 +
2 files changed, 28 insertions(+)
diff --git a/contrib/src/microdns/fix-null-deref.patch b/contrib/src/microdns/fix-null-deref.patch
new file mode 100644
index 0000000000..f09a7b9e48
--- /dev/null
+++ b/contrib/src/microdns/fix-null-deref.patch
@@ -0,0 +1,27 @@
+From efdf2754f9f8b801048b8fdae2b269f091128193 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb at 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
+
diff --git a/contrib/src/microdns/rules.mak b/contrib/src/microdns/rules.mak
index acaef0919c..26e2614d10 100644
--- a/contrib/src/microdns/rules.mak
+++ b/contrib/src/microdns/rules.mak
@@ -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