[FFmpeg-cvslog] avcodec/jpeg2000dec: Skip de-quantization of empty areas

Michael Niedermayer git at videolan.org
Mon Mar 25 16:03:46 EET 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Mar 19 17:10:42 2019 +0100| [b8f53a23421b0de50947a741a168ae5c7eb24aa3] | committer: Michael Niedermayer

avcodec/jpeg2000dec: Skip de-quantization of empty areas

Fixes: Timeout (26sec -> 18sec)
Fixes: 13448/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-576903098243481

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8f53a23421b0de50947a741a168ae5c7eb24aa3
---

 libavcodec/jpeg2000dec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index a4291bc06b..7749c980e5 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1730,6 +1730,8 @@ static inline void tile_codeblocks(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile
                                     bandpos);
                         if (ret)
                             coded = 1;
+                        else
+                            continue;
                         x = cblk->coord[0][0] - band->coord[0][0];
                         y = cblk->coord[1][0] - band->coord[1][0];
 



More information about the ffmpeg-cvslog mailing list