summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-11-14 15:10:28 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-15 21:31:43 +0100
commitbfa8272f405314582e8f099ec1a9249232553c9c (patch)
tree183f71e1dc85dd7694069eb4f2f6312864d365b8
parent73ee53f317418a5719f6169e6171b40f90d18321 (diff)
vcodec/agm: Alloc based on coded dimensions
Fixes: out of array read Fixes: 18715/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5659333417500672 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>
-rw-r--r--libavcodec/agm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/agm.c b/libavcodec/agm.c
index 3b2c21e9a7..89f85f03c6 100644
--- a/libavcodec/agm.c
+++ b/libavcodec/agm.c
@@ -827,7 +827,7 @@ static int decode_intra(AVCodecContext *avctx, GetBitContext *gb, AVFrame *frame
static int decode_motion_vectors(AVCodecContext *avctx, GetBitContext *gb)
{
AGMContext *s = avctx->priv_data;
- int nb_mvs = ((avctx->height + 15) >> 4) * ((avctx->width + 15) >> 4);
+ int nb_mvs = ((avctx->coded_height + 15) >> 4) * ((avctx->coded_width + 15) >> 4);
int ret, skip = 0, value, map;
av_fast_padded_malloc(&s->mvectors, &s->mvectors_size,