[FFmpeg-cvslog] Check for malloc failures in fraps decoder.

Reimar Döffinger git at videolan.org
Sun Apr 24 18:09:40 CEST 2011


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sun Apr 24 14:49:29 2011 +0200| [67c1a59ad7f9057f86d1605df3c28db0edb99bef] | committer: Reimar Döffinger

Check for malloc failures in fraps decoder.

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

 libavcodec/fraps.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index 1bd6fc3..8d40ed2 100644
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -274,6 +274,8 @@ static int decode_frame(AVCodecContext *avctx,
         for(i = 0; i < planes; i++){
             is_chroma = !!i;
             av_fast_malloc(&s->tmpbuf, &s->tmpbuf_size, offs[i + 1] - offs[i] - 1024 + FF_INPUT_BUFFER_PADDING_SIZE);
+            if (!s->tmpbuf)
+                return AVERROR(ENOMEM);
             if(fraps2_decode_plane(s, f->data[i], f->linesize[i], avctx->width >> is_chroma,
                     avctx->height >> is_chroma, buf + offs[i], offs[i + 1] - offs[i], is_chroma, 1) < 0) {
                 av_log(avctx, AV_LOG_ERROR, "Error decoding plane %i\n", i);
@@ -316,6 +318,8 @@ static int decode_frame(AVCodecContext *avctx,
         offs[planes] = buf_size;
         for(i = 0; i < planes; i++){
             av_fast_malloc(&s->tmpbuf, &s->tmpbuf_size, offs[i + 1] - offs[i] - 1024 + FF_INPUT_BUFFER_PADDING_SIZE);
+            if (!s->tmpbuf)
+                return AVERROR(ENOMEM);
             if(fraps2_decode_plane(s, f->data[0] + i + (f->linesize[0] * (avctx->height - 1)), -f->linesize[0],
                     avctx->width, avctx->height, buf + offs[i], offs[i + 1] - offs[i], 0, 3) < 0) {
                 av_log(avctx, AV_LOG_ERROR, "Error decoding plane %i\n", i);



More information about the ffmpeg-cvslog mailing list