OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0988a6a
)
j2kdec: Fix integer overflow leading to a segfault
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 16 Dec 2011 03:16:01 +0000
(
04:16
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 16 Dec 2011 03:16:01 +0000
(
04:16
+0100)
Fixes Ticket776
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/j2k_dwt.c
patch
|
blob
|
history
diff --git
a/libavcodec/j2k_dwt.c
b/libavcodec/j2k_dwt.c
index
ab7a1ab
..
48aa337
100644
(file)
--- 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;