diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 11:55:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 11:55:45 +0200 |
| commit | 3f0364327c32175221104799958702458be8fbd6 (patch) | |
| tree | 398f383c6ec344d8e64e24e5585606adf25ff5ae | |
| parent | 37a970bbb668956956c632652a4316cceb48955a (diff) | |
| parent | fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e (diff) | |
| download | ffmpeg-3f0364327c32175221104799958702458be8fbd6.tar.gz | |
Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
* commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e':
jpeg2000: Check code-block size
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 043ec03a2e..8e582aa2cf 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -284,7 +284,7 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) c->log2_cblk_height = (bytestream2_get_byteu(&s->g) & 15) + 2; // cblk height if (c->log2_cblk_width > 10 || c->log2_cblk_height > 10 || - c->log2_cblk_width + c->log2_cblk_height > 14) { + c->log2_cblk_width + c->log2_cblk_height > 12) { av_log(s->avctx, AV_LOG_ERROR, "cblk size invalid\n"); return AVERROR_INVALIDDATA; } |