summaryrefslogtreecommitdiff
path: root/libavcodec/agm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-04-11 00:36:48 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-04-11 19:25:42 +0200
commit3308e3da045e8a01ee08affa33a2d424629ca2e3 (patch)
tree86e20aa0dff5bb389d92688d081ff1102aee6c65 /libavcodec/agm.c
parentd0f24df648f46e4c9a385e12a057fbade21427db (diff)
avcodec/agm: Check frame dimensions
Fixes: out of array access Fixes: 14110/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5649184864075776 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/agm.c')
-rw-r--r--libavcodec/agm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/agm.c b/libavcodec/agm.c
index ab9b93a5f8..f5fd5d065e 100644
--- a/libavcodec/agm.c
+++ b/libavcodec/agm.c
@@ -1178,6 +1178,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
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;
if (!(s->flags & 2)) {
ret = av_frame_copy(frame, s->prev_frame);