vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Thu Jan 24 18:42:36 2019 +0100| [a308f54b23519c1648975cfce8edb3f1addb6db3] | committer: Francois Cartegnie
demux: mp4: fix potential NULL deref TrackGotoChunkSample changes p_es > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a308f54b23519c1648975cfce8edb3f1addb6db3 --- modules/demux/mp4/mp4.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 61c9be01ec..3859effa33 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -1348,8 +1348,9 @@ static int DemuxTrack( demux_t *p_demux, mp4_track_t *tk, uint64_t i_readpos, } /* Next sample */ - if ( i_nb_samples ) /* sample size could be 0, need to go fwd. see return */ - MP4_TrackNextSample( p_demux, tk, i_nb_samples ); + if ( i_nb_samples && /* sample size could be 0, need to go fwd. see return */ + MP4_TrackNextSample( p_demux, tk, i_nb_samples ) ) + goto end; uint32_t i_next_run_seq = MP4_TrackGetRunSeq( tk ); if( i_next_run_seq != i_run_seq ) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
