ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Wed May 17 01:12:55 2017 +0200| [355e27e24dc88d6ba8f27501a34925d9d937a399] | committer: Michael Niedermayer
avcodec/flicvideo: Check frame_size before decrementing Fixes: runtime error: signed integer overflow: -2147483627 - 22 cannot be represented in type 'int' Fixes: 1637/clusterfuzz-testcase-minimized-5376582493405184 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=355e27e24dc88d6ba8f27501a34925d9d937a399 --- libavcodec/flicvideo.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 7f9b871dc7..ccc6cb25b3 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -199,6 +199,9 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, num_chunks = bytestream2_get_le16(&g2); bytestream2_skip(&g2, 8); /* skip padding */ + if (frame_size < 16) + return AVERROR_INVALIDDATA; + frame_size -= 16; /* iterate through the chunks */ @@ -523,6 +526,8 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, if (frame_size > buf_size) frame_size = buf_size; + if (frame_size < 16) + return AVERROR_INVALIDDATA; frame_size -= 16; /* iterate through the chunks */ @@ -815,6 +820,8 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx, if (frame_size > buf_size) frame_size = buf_size; + if (frame_size < 16) + return AVERROR_INVALIDDATA; frame_size -= 16; /* iterate through the chunks */ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
