]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
mpegts input: fix possible NULL dereference (fix for the last patch)
authorJaroslav Kysela <perex@perex.cz>
Wed, 12 Nov 2014 08:52:55 +0000 (09:52 +0100)
committerJaroslav Kysela <perex@perex.cz>
Wed, 12 Nov 2014 08:52:55 +0000 (09:52 +0100)
src/input/mpegts/mpegts_input.c

index 4a49c67a7c6374e0b2778b4d65b5df2296258587..b5e46c6738a9c77ebd43642e643afd2568535636 100644 (file)
@@ -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;