From 25cadd366bce02e3d1fc070ee6dd9f208e2b11c9 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 19 Dec 2011 04:09:23 +0100 Subject: [PATCH] adpcm: Fix crash Fixes half of Ticket794 Bug found by: Oana Stratulat Signed-off-by: Michael Niedermayer (cherry picked from commit 608708009f69ba4cecebf05120c696167494c897) Signed-off-by: Michael Niedermayer --- libavcodec/adpcm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index bbc7d1cd27..e7657945dd 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -818,6 +818,9 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, /* Each EA ADPCM frame has a 12-byte header followed by 30-byte pieces, each coding 28 stereo samples. */ + if(avctx->channels != 2) + return AVERROR_INVALIDDATA; + src += 4; // skip sample count (already read) current_left_sample = (int16_t)bytestream_get_le16(&src);