ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Tue May 14 20:23:48 2019 +0200| [c830752142bb5e052d540c429d41fb6dafe920db] | committer: Michael Niedermayer
avcodec/pngdec: Check input space Fixes: Timeout (33sec -> 78ms) Fixes: 14668/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LSCR_fuzzer-5767073352908800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c830752142bb5e052d540c429d41fb6dafe920db --- libavcodec/pngdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 7fcf83e347..5209e342db 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1535,6 +1535,9 @@ static int decode_frame_lscr(AVCodecContext *avctx, AVFrame *frame = data; int ret, nb_blocks, offset = 0; + if (avpkt->size < 2) + return AVERROR_INVALIDDATA; + bytestream2_init(gb, avpkt->data, avpkt->size); if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
