vlc | branch: master | Filip Roséen <[email protected]> | Wed Mar 1 09:52:10 2017 +0100| [4c23a7d0998d4a353078b520a4903385f996c54a] | committer: Jean-Baptiste Kempf
codec/svcdsub: fix potential null-dereference if block_ChainGather fails we would try to dereference a null-pointer, these changes instead make sure that we discard the data in order to advance forward. Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4c23a7d0998d4a353078b520a4903385f996c54a --- modules/codec/svcdsub.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c index 7961d94..807df03 100644 --- a/modules/codec/svcdsub.c +++ b/modules/codec/svcdsub.c @@ -303,6 +303,16 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block ) { block_t *p_spu = block_ChainGather( p_sys->p_spu ); + if( unlikely( !p_spu ) ) + { + block_ChainRelease( p_sys->p_spu ); + p_sys->i_state = SUBTITLE_BLOCK_EMPTY; + p_sys->p_spu = NULL; + + msg_Warn( p_dec, "unable to assemble blocks, discarding" ); + return NULL; + } + if( p_spu->i_buffer != p_sys->i_spu_size ) { msg_Warn( p_dec, "subtitle packets size=%zu should be %zu", _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
