virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavfi/vf_alphamerge: fix memory leaks

Browse Source 
Recent commits 6aaac24d72 and
3835554bf8 made progress towards cleaning
up usage of the formats API, and in particular fixed possible NULL pointer
dereferences.

This commit addresses the issue of possible resource leaks when some intermediate
call fails.

Tested with valgrind --leak-check=full --show-leak-kinds=all, and manual simulation
of malloc/realloc failures.

Fixes: CID 1338326, 1338329.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
This commit is contained in:
Ganesh Ajjanagadde 2015-12-04 00:37:19 -05:00
parent 301c2784b3
commit 31f0d555e0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/vf_alphamerge.c
View File

@ -61,13 +61,23 @@ static int query_formats(AVFilterContext *ctx)
int ret; int ret;
if (!(main_formats = ff_make_format_list(main_fmts)) || if (!(main_formats = ff_make_format_list(main_fmts)) ||
!(alpha_formats = ff_make_format_list(alpha_fmts))) !(alpha_formats = ff_make_format_list(alpha_fmts))) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
if ((ret = ff_formats_ref(main_formats , &ctx->inputs[0]->out_formats)) < 0 || if ((ret = ff_formats_ref(main_formats , &ctx->inputs[0]->out_formats)) < 0 ||
(ret = ff_formats_ref(alpha_formats, &ctx->inputs[1]->out_formats)) < 0 || (ret = ff_formats_ref(alpha_formats, &ctx->inputs[1]->out_formats)) < 0 ||
(ret = ff_formats_ref(main_formats , &ctx->outputs[0]->in_formats)) < 0) (ret = ff_formats_ref(main_formats , &ctx->outputs[0]->in_formats)) < 0)
return ret; goto fail;
return 0; return 0;
fail:
if (main_formats)
av_freep(&main_formats->formats);
av_freep(&main_formats);
if (alpha_formats)
av_freep(&alpha_formats->formats);
av_freep(&alpha_formats);
return ret;
} }
static int config_input_main(AVFilterLink *inlink) static int config_input_main(AVFilterLink *inlink)