From f0695b09dd479e9f20e522417a46a6132c391a1c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 1 Dec 2012 02:36:01 +0100 Subject: pcmdec: check codec_id Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/pcm.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libavcodec/pcm.c') diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 5ed603ee3f..d769fb1e38 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -338,6 +338,11 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, return AVERROR(EINVAL); } + if (avctx->codec_id != avctx->codec->id) { + av_log(avctx, AV_LOG_ERROR, "codec ids mismatch\n"); + return AVERROR(EINVAL); + } + n = avctx->channels * sample_size; if (n && buf_size % n) { -- cgit v1.2.3