[FFmpeg-cvslog] zmbv: check av_realloc() return values and avoid memleaks on ENOMEM

Janne Grunau git at videolan.org
Thu Feb 2 02:46:25 CET 2012


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Wed Feb  1 01:00:17 2012 +0100| [cb0b284381ea506a54c59c4968cd2c2c937f4d75] | committer: Janne Grunau

zmbv: check av_realloc() return values and avoid memleaks on ENOMEM

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb0b284381ea506a54c59c4968cd2c2c937f4d75
---

 libavcodec/zmbv.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 2345eb3..a454635 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;
      }



More information about the ffmpeg-cvslog mailing list