diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-01-05 20:50:55 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-05-28 21:21:53 +0200 |
| commit | 15c819e23ff1820ab6e0ea71291f939e36b2efb3 (patch) | |
| tree | 4fe026ca01e89ce50dc5a1099444435e75440569 | |
| parent | 7a5fbe40344ae51ce629cc0694a436535beb1233 (diff) | |
| download | ffmpeg-15c819e23ff1820ab6e0ea71291f939e36b2efb3.tar.gz | |
adpcm: ADPCM Electronic Arts has always two channels
Fixes half of http://ffmpeg.org/trac/ffmpeg/ticket/794
Adresses CVE-2012-0852
(cherry picked from commit bb5b3940b08d8dad5b7e948e8f3b02cd2eb70716)
Conflicts:
libavcodec/adpcm.c
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit b581580bd1cc8506befa65b0a5c9ae429240f21f)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/adpcm.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 68bd656aa6..2cf2d20f46 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -678,17 +678,23 @@ static int adpcm_encode_frame(AVCodecContext *avctx, static av_cold int adpcm_decode_init(AVCodecContext * avctx) { ADPCMContext *c = avctx->priv_data; + unsigned int min_channels = 1; unsigned int max_channels = 2; switch(avctx->codec->id) { + case CODEC_ID_ADPCM_EA: + min_channels = 2; + break; case CODEC_ID_ADPCM_EA_R1: case CODEC_ID_ADPCM_EA_R2: case CODEC_ID_ADPCM_EA_R3: max_channels = 6; break; } - if(avctx->channels > max_channels){ - return -1; + + if (avctx->channels < min_channels || avctx->channels > max_channels) { + av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n"); + return AVERROR(EINVAL); } switch(avctx->codec->id) { |