diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-19 17:10:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-25 13:20:30 +0100 |
| commit | b8f53a23421b0de50947a741a168ae5c7eb24aa3 (patch) | |
| tree | 80a46bd66422b763fa4ddd0aa6ea57b108ee7c99 /libavcodec/jpeg2000dec.c | |
| parent | c0ca67ba4083762cf5c8eeb1229b333777f25159 (diff) | |
| download | ffmpeg-streaming-b8f53a23421b0de50947a741a168ae5c7eb24aa3.zip ffmpeg-streaming-b8f53a23421b0de50947a741a168ae5c7eb24aa3.tar.gz | |
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@niedermayer.cc>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index a4291bc..7749c98 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]; |
