diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-19 15:32:02 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-10-04 03:26:28 +0200 |
| commit | bacf5db1962a6955ce80eea6bbc86c6970d7d360 (patch) | |
| tree | 8c4c98277cd8261eab1e786d9f091ca0b7f598d7 | |
| parent | 5358f1b50753638628fa5b99afd4b7da20d62e22 (diff) | |
| download | ffmpeg-bacf5db1962a6955ce80eea6bbc86c6970d7d360.tar.gz | |
mpegaudiodec: Validate that the number of channels fits at the given offset
This is similar to the fix in 35cbc98b.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit e9d61de96c113ee0ef8082833c7e682df0e23eec)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index fda0280b44..bd096df26a 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1936,7 +1936,8 @@ static int decode_frame_mp3on4(AVCodecContext *avctx, void *data, avpriv_mpegaudio_decode_header((MPADecodeHeader *)m, header); - if (ch + m->nb_channels > avctx->channels) { + if (ch + m->nb_channels > avctx->channels || + s->coff[fr] + m->nb_channels > avctx->channels) { av_log(avctx, AV_LOG_ERROR, "frame channel count exceeds codec " "channel count\n"); return AVERROR_INVALIDDATA; |