diff mbox

[FFmpeg-devel,3/5] avcodec/mjpegdec: Check for end of bitstream in ljpeg_decode_rgb_scan()

Message ID 20180621221517.25133-3-michael@niedermayer.cc
State Accepted
Commit 540e8c2d641bf90fc28e47e170f8c0b1962197e9
Headers show

Commit Message

Michael Niedermayer June 21, 2018, 10:15 p.m. UTC 
Fixes: Timeout
Fixes: 8648/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEG_fuzzer-5108395525799936

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 | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Michael Niedermayer June 22, 2018, 10:40 p.m. UTC | #1 
On Fri, Jun 22, 2018 at 12:15:15AM +0200, Michael Niedermayer wrote:
> Fixes: Timeout
> Fixes: 8648/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEG_fuzzer-5108395525799936
> 
> 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 | 5 +++++
>  1 file changed, 5 insertions(+)

will apply

[...]
diff mbox

Patch

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index d1dca84d36..00cfdd7151 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1055,6 +1055,11 @@  static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p
         for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
             int modified_predictor = predictor;
 
+            if (get_bits_left(&s->gb) < 1) {
+                av_log(s->avctx, AV_LOG_ERROR, "bitstream end in rgb_scan\n");
+                return AVERROR_INVALIDDATA;
+            }
+
             if (s->restart_interval && !s->restart_count){
                 s->restart_count = s->restart_interval;
                 resync_mb_x = mb_x;