highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/dnxhdenc: stop leaking memory when initalization fails

Browse Source 
Fixes #6593.
This commit is contained in:
Paul B Mahol
2018-08-30 11:35:07 +02:00
parent 56f68a099c
commit aeb73c73e1
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/dnxhdenc.c
View File

@@ -207,17 +207,17 @@ static av_cold int dnxhd_init_vlc(DNXHDEncContext *ctx)
int i, j, level, run; int i, j, level, run;
int max_level = 1 << (ctx->bit_depth + 2); int max_level = 1 << (ctx->bit_depth + 2);
FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->vlc_codes, FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->orig_vlc_codes,
max_level, 4 * sizeof(*ctx->vlc_codes), fail); max_level, 4 * sizeof(*ctx->orig_vlc_codes), fail);
FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->vlc_bits, FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->orig_vlc_bits,
max_level, 4 * sizeof(*ctx->vlc_bits), fail); max_level, 4 * sizeof(*ctx->orig_vlc_bits), fail);
FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->run_codes, FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->run_codes,
63 * 2, fail); 63 * 2, fail);
FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->run_bits, FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->run_bits,
63, fail); 63, fail);
ctx->vlc_codes += max_level * 2; ctx->vlc_codes = ctx->orig_vlc_codes + max_level * 2;
ctx->vlc_bits += max_level * 2; ctx->vlc_bits = ctx->orig_vlc_bits + max_level * 2;
for (level = -max_level; level < max_level; level++) { for (level = -max_level; level < max_level; level++) {
for (run = 0; run < 2; run++) { for (run = 0; run < 2; run++) {
int index = (level << 1) | run; int index = (level << 1) | run;
@@ -1348,11 +1348,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
static av_cold int dnxhd_encode_end(AVCodecContext *avctx) static av_cold int dnxhd_encode_end(AVCodecContext *avctx)
{ {
DNXHDEncContext *ctx = avctx->priv_data; DNXHDEncContext *ctx = avctx->priv_data;
int max_level = 1 << (ctx->bit_depth + 2);
int i; int i;
av_free(ctx->vlc_codes - max_level * 2); av_freep(&ctx->orig_vlc_codes);
av_free(ctx->vlc_bits - max_level * 2); av_freep(&ctx->orig_vlc_bits);
av_freep(&ctx->run_codes); av_freep(&ctx->run_codes);
av_freep(&ctx->run_bits); av_freep(&ctx->run_bits);
@@ -1392,6 +1391,7 @@ AVCodec ff_dnxhd_encoder = {
.encode2 = dnxhd_encode_picture, .encode2 = dnxhd_encode_picture,
.close = dnxhd_encode_end, .close = dnxhd_encode_end,
.capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.pix_fmts = (const enum AVPixelFormat[]) { .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P,
AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P10,

2
libavcodec/dnxhdenc.h
View File

@@ -86,6 +86,8 @@ typedef struct DNXHDEncContext {
unsigned frame_bits; unsigned frame_bits;
uint8_t *src[3]; uint8_t *src[3];
uint32_t *orig_vlc_codes;
uint8_t *orig_vlc_bits;
uint32_t *vlc_codes; uint32_t *vlc_codes;
uint8_t *vlc_bits; uint8_t *vlc_bits;
uint16_t *run_codes; uint16_t *run_codes;