[vlc-commits] demux: mp4: fix potential null deref

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Dec 14 20:26:29 2016 +0100| [e2010bec054ead84171bd37a40237320458ad82f] | committer: Francois Cartegnie

demux: mp4: fix potential null deref

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

 modules/demux/mp4/mp4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 20cf83b..3514e4f 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -2624,7 +2624,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
     if( pp_es )
         *pp_es = MP4_AddTrackES( p_demux->out, p_track );
 
-    return VLC_SUCCESS;
+    return ( !pp_es || *pp_es ) ? VLC_SUCCESS : VLC_EGENERIC;
 }
 
 /* *** Try to find nearest sync points *** */