generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 75422280fb)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-11-27 20:52:39 +01:00
parent 0cd23e0d1e
commit 8ef86669ca
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/jpeg2000dwt.c
View File

@@ -555,6 +555,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);