diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-16 04:16:01 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 18:27:59 +0100 |
commit | e7cb6e1c04f409db512639af1e74af28e3ae145e (patch) | |
tree | 70869a6e2fd2301ade6d8f9af6e1b738a0dc1aac | |
parent | 4af03698f30d40700f31fcc5f1fc3286c3dab406 (diff) | |
download | ffmpeg-e7cb6e1c04f409db512639af1e74af28e3ae145e.tar.gz |
j2kdec: Fix integer overflow leading to a segfault
Fixes Ticket776
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1f99939a6361e2e6d6788494dd7c682b051c6c34)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/j2k_dwt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/j2k_dwt.c b/libavcodec/j2k_dwt.c index ab7a1ab757..48aa33735e 100644 --- a/libavcodec/j2k_dwt.c +++ b/libavcodec/j2k_dwt.c @@ -321,7 +321,7 @@ int ff_j2k_dwt_init(DWTContext *s, uint16_t border[2][2], int decomp_levels, int int i, j, lev = decomp_levels, maxlen, b[2][2]; - if (decomp_levels >= FF_DWT_MAX_DECLVLS) + if ((unsigned)decomp_levels >= FF_DWT_MAX_DECLVLS) return AVERROR_INVALIDDATA; s->ndeclevels = decomp_levels; s->type = type; |