[FFmpeg-cvslog] lavc/avuienc: fix mem leak in case of init failure
Lukasz Marek
git at videolan.org
Tue Nov 25 22:18:36 CET 2014
ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Mon Nov 24 04:51:05 2014 +0100| [e29153f414f5b2d10e0386abf7921aed4a4fa454] | committer: Lukasz Marek
lavc/avuienc: fix mem leak in case of init failure
Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e29153f414f5b2d10e0386abf7921aed4a4fa454
---
libavcodec/avuienc.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/libavcodec/avuienc.c b/libavcodec/avuienc.c
index 700b8cb..db640bb 100644
--- a/libavcodec/avuienc.c
+++ b/libavcodec/avuienc.c
@@ -25,16 +25,10 @@
static av_cold int avui_encode_init(AVCodecContext *avctx)
{
- avctx->coded_frame = av_frame_alloc();
-
if (avctx->width != 720 || avctx->height != 486 && avctx->height != 576) {
av_log(avctx, AV_LOG_ERROR, "Only 720x486 and 720x576 are supported.\n");
return AVERROR(EINVAL);
}
- if (!avctx->coded_frame) {
- av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
- return AVERROR(ENOMEM);
- }
if (!(avctx->extradata = av_mallocz(24 + FF_INPUT_BUFFER_PADDING_SIZE)))
return AVERROR(ENOMEM);
avctx->extradata_size = 24;
@@ -45,6 +39,11 @@ static av_cold int avui_encode_init(AVCodecContext *avctx)
avctx->extradata[19] = 1;
}
+ avctx->coded_frame = av_frame_alloc();
+ if (!avctx->coded_frame) {
+ av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
+ return AVERROR(ENOMEM);
+ }
return 0;
}
More information about the ffmpeg-cvslog
mailing list