From: Adam Sutton <dev@adamsutton.me.uk>
Date: Fri, 13 Sep 2013 11:56:02 +0000 (+0100)
Subject: mpegts: ensure that mux descriptor callback is only called with valid mux
X-Git-Tag: v4.1~2525
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6e5ee41dca9b1e3074060c697bf1d4e9af54fcb;p=thirdparty%2Ftvheadend.git

mpegts: ensure that mux descriptor callback is only called with valid mux
---

diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
index a4e5c6d5f..1acd16f1e 100644
--- a/src/input/mpegts/dvb_psi.c
+++ b/src/input/mpegts/dvb_psi.c
@@ -785,7 +785,7 @@ dvb_nit_callback
       tvhtrace(mt->mt_name, "    dtag %02X dlen %d", dtag, dlen);
 
       /* User-defined */
-      if (mt->mt_mux_cb) {
+      if (mt->mt_mux_cb && mux) {
         int i = 0;
         while (mt->mt_mux_cb[i].cb) {
           if (mt->mt_mux_cb[i].tag == dtag)