From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 16 Feb 2015 19:26:22 +0000 (+0100)
Subject: mpegts network: mux discovery - add check to avoid NULL dereference, fixes #2678... 
X-Git-Tag: v4.1~352
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51e9aec9a06b21a51ad802c31e4889d276f026f5;p=thirdparty%2Ftvheadend.git

mpegts network: mux discovery - add check to avoid NULL dereference, fixes #2678, fixes #2674
---

diff --git a/src/input/mpegts/mpegts_network_dvb.c b/src/input/mpegts/mpegts_network_dvb.c
index 97974d26c..9a1da901c 100644
--- a/src/input/mpegts/mpegts_network_dvb.c
+++ b/src/input/mpegts/mpegts_network_dvb.c
@@ -441,6 +441,8 @@ dvb_network_create_mux
         if (!dvb_network_check_orbital_pos(satpos, dmc->u.dmc_fe_qpsk.orbital_pos))
           break;
       }
+      if (mn == NULL)
+        return NULL;
     }
   }