Commit 00c32201 authored by Ganesh Ajjanagadde's avatar Ganesh Ajjanagadde

lavfi/show_palette: fix memory leak

Recent commits 6aaac24d and
3835554b 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. Unfortunately, even leaving aside this subtle intermediate
failure aspect, commit 80876320 was only
partially successful in addressing memleaks. Hopefully, this commit
fixes the issue completely.

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

Fixes: CID 1270818.
Reviewed-by: 's avatarClément Bœsch <u@pkh.me>
Signed-off-by: 's avatarGanesh Ajjanagadde <gajjanagadde@gmail.com>
parent cb93df0d
......@@ -50,14 +50,22 @@ static int query_formats(AVFilterContext *ctx)
AVFilterFormats *in = ff_make_format_list(in_fmts);
AVFilterFormats *out = ff_make_format_list(out_fmts);
if (!in || !out) {
av_freep(&in);
av_freep(&out);
return AVERROR(ENOMEM);
ret = AVERROR(ENOMEM);
goto fail;
}
if ((ret = ff_formats_ref(in , &ctx->inputs[0]->out_formats)) < 0 ||
(ret = ff_formats_ref(out, &ctx->outputs[0]->in_formats)) < 0)
return ret;
goto fail;
return 0;
fail:
if (in)
av_freep(&in->formats);
av_freep(&in);
if (out)
av_freep(&out->formats);
av_freep(&out);
return ret;
}
static int config_output(AVFilterLink *outlink)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment