[vlc-commits] demux: mp4: fix heap read ofw in extra bytes

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Oct  9 23:46:35 2014 +0200| [b27f31c78ce42549d983268a64bf49d9fd42d06c] | committer: Jean-Baptiste Kempf

demux: mp4: fix heap read ofw in extra bytes

(cherry picked from commit 54bbfac289eeeed9ba044bf9f9e1ee43e5642c78)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 7e14232..f94472c 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -1431,7 +1431,7 @@ static int DemuxInit( demux_t *p_demux )
 
                 if( p_sp->i_type_specific_data_length > sizeof( WAVEFORMATEX ) &&
                     i_format != WAVE_FORMAT_MPEGLAYER3 &&
-                    i_format != WAVE_FORMAT_MPEG )
+                    i_format != WAVE_FORMAT_MPEG && i_data >= 19 )
                 {
                     GET_CHECKED( fmt.i_extra, __MIN( GetWLE( &p_data[16] ),
                                          p_sp->i_type_specific_data_length -