From a5615b82eb116e9fd0f71f2b03c333cc31ab706a Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 9 Sep 2013 12:23:56 +0000 Subject: [PATCH] avcodec/eatgv: use av_reallocp_array() and check return value Fixes #2949. Signed-off-by: Paul B Mahol --- libavcodec/eatgv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 54074b37ff..deda86e087 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -169,12 +169,18 @@ static int tgv_decode_inter(TgvContext *s, AVFrame *frame, /* allocate codebook buffers as necessary */ if (num_mvs > s->num_mvs) { - s->mv_codebook = av_realloc(s->mv_codebook, num_mvs*2*sizeof(int)); + if (av_reallocp_array(&s->mv_codebook, num_mvs, sizeof(*s->mv_codebook))) { + s->num_mvs = 0; + return AVERROR(ENOMEM); + } s->num_mvs = num_mvs; } if (num_blocks_packed > s->num_blocks_packed) { - s->block_codebook = av_realloc(s->block_codebook, num_blocks_packed*16); + if (av_reallocp_array(&s->block_codebook, num_blocks_packed, sizeof(*s->block_codebook))) { + s->num_blocks_packed = 0; + return AVERROR(ENOMEM); + } s->num_blocks_packed = num_blocks_packed; }