Module: libav Branch: release/11 Commit: 48952116352ab03565cc14805e0f1d63cf0318fe
Author: Michael Niedermayer <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Sat Oct 4 22:15:07 2014 +0200 on2avc: check number of channels Fixes invalid memory access. CC: [email protected] Bug-ID: CVE-2014-8549 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <[email protected]> (cherry picked from commit cee4490b521fd0d02476d46aa2598af24fb8d686) Signed-off-by: Anton Khirnov <[email protected]> --- libavcodec/on2avc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index 60f451c..1c4b3c9 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -918,6 +918,10 @@ static av_cold int on2avc_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "0x500 version should be mono\n"); return AVERROR_INVALIDDATA; } + if (avctx->channels > 2) { + av_log(avctx, AV_LOG_ERROR, "Only 1 or 2 channels are supported.\n"); + return AVERROR(EINVAL); + } if (avctx->channels == 2) av_log(avctx, AV_LOG_WARNING, "Stereo mode support is not good, patch is welcome\n"); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
