diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-17 15:20:27 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-17 15:32:23 -0800 |
| commit | 3e13005cac6e076053276b515f5fcf59a3f4b65d (patch) | |
| tree | 911738bcef42d26bcdbf3d5cc684133554512c8f /libavcodec/mpegaudiodec.c | |
| parent | c0994e39d7fd63b4f4adfe4714fa6e41bff82a7c (diff) | |
| download | ffmpeg-3e13005cac6e076053276b515f5fcf59a3f4b65d.tar.gz | |
mp3on4: require a minimum framesize.
If bufsize < headersize, init_get_bits() will be called with a negative
number, causing it to fail and any subsequent call to get_bits() will
crash because it reads from a NULL pointer.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index af125d5587..6c088626fc 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1917,6 +1917,10 @@ static int decode_frame_mp3on4(AVCodecContext *avctx, void *data, m = s->mp3decctx[fr]; assert(m != NULL); + if (fsize < HEADER_SIZE) { + av_log(avctx, AV_LOG_ERROR, "Frame size smaller than header size\n"); + return AVERROR_INVALIDDATA; + } header = (AV_RB32(buf) & 0x000fffff) | s->syncword; // patch header if (ff_mpa_check_header(header) < 0) // Bad header, discard block |