diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-04 00:46:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-31 19:51:56 +0100 |
| commit | a93c1d1e83920c07a06cdf1f4bd3bcb8427cc5d5 (patch) | |
| tree | 649c0f7d4ae15bb048be09370b7f09b677f86b0a | |
| parent | d3d4ba2dbec0428505ade3732b9b83463bece74f (diff) | |
| download | ffmpeg-a93c1d1e83920c07a06cdf1f4bd3bcb8427cc5d5.tar.gz | |
avcodec/agm: Check for reference frame earlier
Fixes: Timeout (14sec - 120ms)
Fixes: 17824/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5639825457152000
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 315a4459334fdc1e6b18733fb63439e9d090cebd)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/agm.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/agm.c b/libavcodec/agm.c index 2c4c9805e9..3b2c21e9a7 100644 --- a/libavcodec/agm.c +++ b/libavcodec/agm.c @@ -1117,6 +1117,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, frame->key_frame = s->key_frame; frame->pict_type = s->key_frame ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; + if (!s->key_frame) { + if (!s->prev_frame->data[0]) { + av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n"); + return AVERROR_INVALIDDATA; + } + } + if (header) { if (avctx->codec_tag == MKTAG('A', 'G', 'M', '0') || avctx->codec_tag == MKTAG('A', 'G', 'M', '1')) @@ -1186,10 +1193,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, else ret = decode_intra(avctx, gb, frame); } else { - if (!s->prev_frame->data[0]) { - av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n"); - return AVERROR_INVALIDDATA; - } if (s->prev_frame-> width != frame->width || s->prev_frame->height != frame->height) return AVERROR_INVALIDDATA; |