From b864098c168f601f7c7393893927a4fd3f79ae5d Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Fri, 27 Mar 2009 23:55:38 +0000 Subject: [PATCH] mlpdec: Check for blocksize in proper range. Originally committed as revision 18211 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mlpdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 905fb0bdae..d8fc87b87b 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -609,8 +609,8 @@ static int read_decoding_params(MLPDecodeContext *m, GetBitContext *gbp, if (s->param_presence_flags & PARAM_BLOCKSIZE) if (get_bits1(gbp)) { s->blocksize = get_bits(gbp, 9); - if (s->blocksize > MAX_BLOCKSIZE) { - av_log(m->avctx, AV_LOG_ERROR, "block size too large\n"); + if (s->blocksize < 8 || s->blocksize > m->access_unit_size) { + av_log(m->avctx, AV_LOG_ERROR, "Invalid blocksize."); s->blocksize = 0; return -1; }