ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Aug 5 17:22:23 2018 +0200| [35517e3ca7ea2e243e3e29ec7d4d2a9f150f25ed] | committer: Michael Niedermayer
avcodec/gdv: Error out if we had insufficent input for the output frame in decompress_2() Fixes: Timeout (with the previous commits to gdv.c) Fixes: 9422/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GDV_fuzzer-5143490001371136 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35517e3ca7ea2e243e3e29ec7d4d2a9f150f25ed --- libavcodec/gdv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c index d497f76157..b54f7373d1 100644 --- a/libavcodec/gdv.c +++ b/libavcodec/gdv.c @@ -230,6 +230,10 @@ static int decompress_2(AVCodecContext *avctx) break; } } + + if (bytestream2_get_bytes_left_p(pb) > 0) + return AVERROR_INVALIDDATA; + return 0; } @@ -458,6 +462,8 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data, default: av_assert0(0); } + if (ret < 0) + return ret; memcpy(frame->data[1], gdv->pal, AVPALETTE_SIZE); dst = frame->data[0]; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
