[SCM] libav/experimental: Improve handling allocated buffers in Xan decoder
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:56:13 UTC 2013
The following commit has been merged in the experimental branch:
commit 0080402d36c23bfba44fde3a1d472295a15a09fb
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date: Sat Dec 19 17:04:30 2009 +0000
Improve handling allocated buffers in Xan decoder
Originally committed as revision 20899 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index e0bd780..c11f60d 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -76,10 +76,14 @@ static av_cold int xan_decode_init(AVCodecContext *avctx)
s->buffer1_size = avctx->width * avctx->height;
s->buffer1 = av_malloc(s->buffer1_size);
+ if (!s->buffer1)
+ return -1;
s->buffer2_size = avctx->width * avctx->height;
s->buffer2 = av_malloc(s->buffer2_size + 130);
- if (!s->buffer1 || !s->buffer2)
+ if (!s->buffer2) {
+ av_freep(&s->buffer1);
return -1;
+ }
return 0;
}
@@ -405,8 +409,8 @@ static av_cold int xan_decode_end(AVCodecContext *avctx)
if (s->current_frame.data[0])
avctx->release_buffer(avctx, &s->current_frame);
- av_free(s->buffer1);
- av_free(s->buffer2);
+ av_freep(&s->buffer1);
+ av_freep(&s->buffer2);
return 0;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list