From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 4 Oct 2014 20:15:07 +0000 (+0200)
Subject: on2avc: check number of channels
X-Git-Tag: android-x86-6.0-r1~10^2~303
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cee4490b521fd0d02476d46aa2598af24fb8d686;p=android-x86%2Fexternal-ffmpeg.git

on2avc: check number of channels

Fixes invalid memory access.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8549
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
---

diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c
index deaa2b4c04..c00339f7b0 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");