From cb0b284381ea506a54c59c4968cd2c2c937f4d75 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 1 Feb 2012 01:00:17 +0100 Subject: [PATCH] zmbv: check av_realloc() return values and avoid memleaks on ENOMEM --- libavcodec/zmbv.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 2345eb36b5..a4546356ec 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -404,6 +404,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac int zret = Z_OK; // Zlib return code int len = buf_size; int hi_ver, lo_ver; + uint8_t *tmp; if (c->pic.data[0]) avctx->release_buffer(avctx, &c->pic); @@ -485,8 +486,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac return -1; } - c->cur = av_realloc(c->cur, avctx->width * avctx->height * (c->bpp / 8)); - c->prev = av_realloc(c->prev, avctx->width * avctx->height * (c->bpp / 8)); + tmp = av_realloc(c->cur, avctx->width * avctx->height * (c->bpp / 8)); + if (!tmp) + return AVERROR(ENOMEM); + c->cur = tmp; + tmp = av_realloc(c->prev, avctx->width * avctx->height * (c->bpp / 8)); + if (!tmp) + return AVERROR(ENOMEM); + c->prev = tmp; c->bx = (c->width + c->bw - 1) / c->bw; c->by = (c->height+ c->bh - 1) / c->bh; }