Commit 75422280 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/jpeg2000dwt: Check ndeclevels before calling dwt_decode*()

Fixes out of array access
Fixes: 01859c9a9ac6cd60a008274123275574/asan_heap-oob_1dff571_8250_50d3d1611e294c3519fd1fa82198b69b.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 8453095f
...@@ -595,6 +595,9 @@ int ff_dwt_encode(DWTContext *s, void *t) ...@@ -595,6 +595,9 @@ int ff_dwt_encode(DWTContext *s, void *t)
int ff_dwt_decode(DWTContext *s, void *t) int ff_dwt_decode(DWTContext *s, void *t)
{ {
if (s->ndeclevels == 0)
return 0;
switch (s->type) { switch (s->type) {
case FF_DWT97: case FF_DWT97:
dwt_decode97_float(s, t); dwt_decode97_float(s, t);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment