virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavc/libxvid: fix mem leak in case of init failure

Browse Source 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
This commit is contained in:
Lukasz Marek
2014-11-24 01:10:49 +01:00
parent 5182a2a235
commit efe34e87eb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/libxvid.c
View File

@@ -359,7 +359,7 @@ static void xvid_correct_framerate(AVCodecContext *avctx)
static av_cold int xvid_encode_init(AVCodecContext *avctx) static av_cold int xvid_encode_init(AVCodecContext *avctx)
{ {
int xerr, i; int xerr, i, ret = -1;
int xvid_flags = avctx->flags; int xvid_flags = avctx->flags;
struct xvid_context *x = avctx->priv_data; struct xvid_context *x = avctx->priv_data;
uint16_t *intra, *inter; uint16_t *intra, *inter;
@@ -659,13 +659,15 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx)
x->encoder_handle = xvid_enc_create.handle; x->encoder_handle = xvid_enc_create.handle;
avctx->coded_frame = av_frame_alloc(); avctx->coded_frame = av_frame_alloc();
if (!avctx->coded_frame) if (!avctx->coded_frame) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
return 0; return 0;
fail: fail:
xvid_encode_close(avctx); xvid_encode_close(avctx);
return -1; return ret;
} }
static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
@@ -812,6 +814,7 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx)
av_freep(&x->twopassfile); av_freep(&x->twopassfile);
av_freep(&x->intra_matrix); av_freep(&x->intra_matrix);
av_freep(&x->inter_matrix); av_freep(&x->inter_matrix);
av_frame_free(&avctx->coded_frame);
return 0; return 0;
} }