From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 12 Nov 2014 08:52:55 +0000 (+0100)
Subject: mpegts input: fix possible NULL dereference (fix for the last patch)
X-Git-Tag: v4.1~782
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7211380a9e981cbf762bb7c337ce6a053fce2f88;p=thirdparty%2Ftvheadend.git

mpegts input: fix possible NULL dereference (fix for the last patch)
---

diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index 4a49c67a7..b5e46c673 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -724,10 +724,10 @@ mpegts_input_process
   int table_wakeup = 0;
   uint8_t *end = mpkt->mp_data + len;
   mpegts_mux_t          *mm  = mpkt->mp_mux;
-  mpegts_mux_instance_t *mmi = mm->mm_active;
+  mpegts_mux_instance_t *mmi;
   mpegts_pid_t *last_mp = NULL;
 
-  if (!mmi)
+  if (mm == NULL || (mmi = mm->mm_active) == NULL)
     return;
 
   mi->mi_live = 1;