aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mlpdec.c
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2009-03-27 23:55:38 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2009-03-27 23:55:38 +0000
commitb864098c168f601f7c7393893927a4fd3f79ae5d (patch)
treedfb9d55d4f16e5724954752cd91de8b1c113e4d0 /libavcodec/mlpdec.c
parent8e9ee714fcf764278d84c3b2ca877cffbd730147 (diff)
downloadffmpeg-b864098c168f601f7c7393893927a4fd3f79ae5d.tar.gz
mlpdec: Check for blocksize in proper range.
Originally committed as revision 18211 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mlpdec.c')
-rw-r--r--libavcodec/mlpdec.c4
1 files 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;
}