diff mbox series

[FFmpeg-devel,1/2] avcodec/mjpegdec: Check for bits left in mjpeg_decode_scan_progressive_ac()

Message ID 20210822215558.3227-1-michael@niedermayer.cc
State Accepted
Commit 909faca929cf30dcd439fa33479177e76fb5121d
Headers show
Series [FFmpeg-devel,1/2] avcodec/mjpegdec: Check for bits left in mjpeg_decode_scan_progressive_ac() | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Michael Niedermayer Aug. 22, 2021, 9:55 p.m. UTC 
Fixes: Timeout
Fixes: 36262/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-4969052454912000

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/mjpegdec.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer Aug. 28, 2021, 4:09 p.m. UTC | #1 
On Sun, Aug 22, 2021 at 11:55:57PM +0200, Michael Niedermayer wrote:
> Fixes: Timeout
> Fixes: 36262/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-4969052454912000
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mjpegdec.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply set

[...]
diff mbox series

Patch

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 8172dca513..2a5868fe1d 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1580,6 +1580,9 @@  static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss,
                 else
                     ret = decode_block_progressive(s, *block, last_nnz, s->ac_index[0],
                                                    quant_matrix, ss, se, Al, &EOBRUN);
+
+                if (ret >= 0 && get_bits_left(&s->gb) < 0)
+                    ret = AVERROR_INVALIDDATA;
                 if (ret < 0) {
                     av_log(s->avctx, AV_LOG_ERROR,
                            "error y=%d x=%d\n", mb_y, mb_x);