projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0d31833
)
Check data_size in decode_frame_mp3on4().
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 23 Sep 2009 11:33:44 +0000
(11:33 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 23 Sep 2009 11:33:44 +0000
(11:33 +0000)
Originally committed as revision 19987 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mpegaudiodec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegaudiodec.c
b/libavcodec/mpegaudiodec.c
index
6f451c3
..
3003e18
100644
(file)
--- a/
libavcodec/mpegaudiodec.c
+++ b/
libavcodec/mpegaudiodec.c
@@
-2466,6
+2466,9
@@
static int decode_frame_mp3on4(AVCodecContext * avctx,
OUT_INT *outptr, *bp;
int fr, j, n;
+ if(*data_size < MPA_FRAME_SIZE * MPA_MAX_CHANNELS * s->frames * sizeof(OUT_INT))
+ return -1;
+
*data_size = 0;
// Discard too short frames
if (buf_size < HEADER_SIZE)