aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-29 01:04:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-01 20:51:35 +0200
commitd414c77ded5e8896e3a63dbdbd09bd96e70fbf6e (patch)
tree3dc939a59b6ebbea818dd19e00ff368d62db7994
parentdc9b708f4d79162771d893532fe35159fad0c21d (diff)
downloadffmpeg-d414c77ded5e8896e3a63dbdbd09bd96e70fbf6e.tar.gz
Check for unsupported parameters in ff_j2k_dwt_init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b4483a531a139f304f4370f470325facb107202f)
-rw-r--r--libavcodec/j2k_dwt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/j2k_dwt.c b/libavcodec/j2k_dwt.c
index 9ba770ad83..ab7a1ab757 100644
--- a/libavcodec/j2k_dwt.c
+++ b/libavcodec/j2k_dwt.c
@@ -321,6 +321,8 @@ 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)
+ return AVERROR_INVALIDDATA;
s->ndeclevels = decomp_levels;
s->type = type;