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

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jan 13 16:06:45 2016 +0100| [30c7f613f61483e9b9bd2d028b689a22ab199398] | committer: Francois Cartegnie

demux: ts: fix null deref (cid #1348115)

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

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

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index f3c3645..3276584 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -2279,7 +2279,10 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid, block_t *p_pes )
                 block_Release( p_block );
                 p_block = NULL;
             }
-            p_block = J2K_Parse( p_demux, p_block, pid->u.p_pes->es.b_interlaced );
+            else
+            {
+                p_block = J2K_Parse( p_demux, p_block, pid->u.p_pes->es.b_interlaced );
+            }
             if( !p_block )
                 return;
         }