diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-05 22:00:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-18 01:16:04 +0200 |
| commit | 14cea440183fe72eaabbf1b964c31f31f4f1cb2a (patch) | |
| tree | d49e16e5b4084a2ca0f8de0f311f1dc0223a279d | |
| parent | b802baadfda46cd5735c1b7f8dd2d8d649cf2787 (diff) | |
| download | ffmpeg-14cea440183fe72eaabbf1b964c31f31f4f1cb2a.tar.gz | |
avcodec/fic: Check available input space for cursor
Fixes: out of array read
Fixes: 6546/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FIC_fuzzer-6317064647081984
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cb2f7ea96b4f6e03ebf0c0563677745fc65f148e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/fic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/fic.c b/libavcodec/fic.c index d7ee370423..526af63f6c 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -337,6 +337,10 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data, skip_cursor = 1; } + if (!skip_cursor && avpkt->size < CURSOR_OFFSET + sizeof(ctx->cursor_buf)) { + skip_cursor = 1; + } + /* Slice height for all but the last slice. */ ctx->slice_h = 16 * (ctx->aligned_height >> 4) / nslices; if (ctx->slice_h % 16) |