| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 2502914c5f8eb77659d7c0868396862557a63245 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Niedermayer <michaelni@gmx.at> |
| 3 | Date: Fri, 9 Nov 2012 13:26:20 +0100 |
| 4 | Subject: [PATCH] atrac3dec: Check coding mode against channels. |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | |
| 8 | Commit 2502914c5f8eb77659d7c0868396862557a63245 release/1.0 |
| 9 | |
| 10 | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind |
| 11 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> |
| 12 | (cherry picked from commit 13451f5520ce6b0afde861b2285dda659f8d4fb4) |
| 13 | |
| 14 | Conflicts: |
| 15 | |
| 16 | libavcodec/atrac3.c |
| 17 | --- |
| 18 | libavcodec/atrac3.c | 5 +++++ |
| 19 | 1 file changed, 5 insertions(+) |
| 20 | |
| 21 | diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c |
| 22 | index 7d076be..1da4c78 100644 |
| 23 | --- a/gst-libs/ext/libav/libavcodec/atrac3.c |
| 24 | +++ b/gst-libs/ext/libav/libavcodec/atrac3.c |
| 25 | @@ -955,6 +955,11 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) |
| 26 | } |
| 27 | /* Check the extradata. */ |
| 28 | |
| 29 | + if (q->codingMode == JOINT_STEREO && avctx->channels < 2) { |
| 30 | + av_log(avctx, AV_LOG_ERROR, "Invalid coding mode\n"); |
| 31 | + return AVERROR_INVALIDDATA; |
| 32 | + } |
| 33 | + |
| 34 | if (q->atrac3version != 4) { |
| 35 | av_log(avctx,AV_LOG_ERROR,"Version %d != 4.\n",q->atrac3version); |
| 36 | return AVERROR_INVALIDDATA; |
| 37 | -- |