aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2012-02-01 01:00:17 +0100
committerJanne Grunau <janne-libav@jannau.net>2012-02-01 12:54:39 +0100
commitcb0b284381ea506a54c59c4968cd2c2c937f4d75 (patch)
tree0203cfb1b5499ccb16cac6403353e705510aa177
parentd4eeadcbbfff880b6d6fb78ed06fe0c58470ce27 (diff)
downloadffmpeg-cb0b284381ea506a54c59c4968cd2c2c937f4d75.tar.gz
zmbv: check av_realloc() return values and avoid memleaks on ENOMEM
-rw-r--r--libavcodec/zmbv.c11
1 files 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;
}