[vlc-commits] packetizer: mpeg4video: check for oob read

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Mar 30 15:05:31 2017 +0200| [4faf56ffa57e2a1da825839e791609fe53de80dd] | committer: Francois Cartegnie

packetizer: mpeg4video: check for oob read

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

 modules/packetizer/mpeg4video.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c
index b6cd010..6932660 100644
--- a/modules/packetizer/mpeg4video.c
+++ b/modules/packetizer/mpeg4video.c
@@ -285,6 +285,9 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
     decoder_sys_t *p_sys = p_dec->p_sys;
     block_t *p_pic = NULL;
 
+    if( p_frag->i_buffer < 4 )
+        return p_frag;
+
     const uint32_t i_startcode = GetDWBE( p_frag->p_buffer );
     if( i_startcode == VISUAL_OBJECT_SEQUENCE_START_CODE ||
         i_startcode == VISUAL_OBJECT_SEQUENCE_END_CODE ||