[vlc-commits] demux: ts: fix forward null deref (cid #1352631)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Feb 15 11:24:14 2016 +0100| [8d046d611b0b7b4504105299e864a12e59cbb980] | committer: Francois Cartegnie

demux: ts: fix forward null deref (cid #1352631)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d046d611b0b7b4504105299e864a12e59cbb980
---

 modules/demux/mpeg/ts.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 79c2a3e..2c6fef7 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -1424,6 +1424,11 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid, block_t *p_pes )
         }
 
         ts_pmt_t *p_pmt = p_es->p_program;
+        if( unlikely(!p_pmt) )
+        {
+            block_ChainRelease( p_block );
+            return;
+        }
 
         while (p_block) {
             block_t *p_next = p_block->p_next;