vlc/vlc-2.1 | branch: master | Rafaël Carré <fun...@videolan.org> | Sat Aug 24 22:10:31 2013 +0200| [40a5d49c0f35a8a51ecec1609dffc5154d601e57] | committer: Jean-Baptiste Kempf
mp4a packetizer: fix buffer overflow (cherry picked from commit 9794ec1cd268c04c8bca13a5fae15df6594dff3e) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=40a5d49c0f35a8a51ecec1609dffc5154d601e57 --- modules/packetizer/mpeg4audio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c index aaad221..c951295 100644 --- a/modules/packetizer/mpeg4audio.c +++ b/modules/packetizer/mpeg4audio.c @@ -804,8 +804,11 @@ static int LOASParse(decoder_t *p_dec, uint8_t *p_buffer, int i_buffer) continue; /* FIXME that's slow (and a bit ugly to write in place) */ - for (int i = 0; i < pi_payload[i_program][i_layer]; i++) + for (int i = 0; i < pi_payload[i_program][i_layer]; i++) { + if (i_accumulated >= i_buffer) + return 0; p_buffer[i_accumulated++] = bs_read(&s, 8); + } } } } else { _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
