diff mbox

[FFmpeg-devel,1/2] avcodec/jpeg2000dec: Skip de-quantization of empty areas

Message ID 20190320000237.27288-1-michael@niedermayer.cc
State Accepted
Commit b8f53a23421b0de50947a741a168ae5c7eb24aa3
Headers show

Commit Message

Michael Niedermayer March 20, 2019, 12:02 a.m. UTC 
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@niedermayer.cc>
---
 libavcodec/jpeg2000dec.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer March 25, 2019, 1:56 p.m. UTC | #1 
On Wed, Mar 20, 2019 at 01:02:36AM +0100, Michael Niedermayer wrote:
> 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@niedermayer.cc>
> ---
>  libavcodec/jpeg2000dec.c | 2 ++
>  1 file changed, 2 insertions(+)

will apply patchset

[...]
diff mbox

Patch

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];