projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8e9ee71
)
mlpdec: Check for blocksize in proper range.
author
Ramiro Polla
<ramiro.polla@gmail.com>
Fri, 27 Mar 2009 23:55:38 +0000
(23:55 +0000)
committer
Ramiro Polla
<ramiro.polla@gmail.com>
Fri, 27 Mar 2009 23:55:38 +0000
(23:55 +0000)
Originally committed as revision 18211 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mlpdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mlpdec.c
b/libavcodec/mlpdec.c
index
905fb0b
..
d8fc87b
100644
(file)
--- 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;
}