From 6aaac24d72a7da631173209841a3944fcb4a3309 Mon Sep 17 00:00:00 2001 From: Ganesh Ajjanagadde Date: Sun, 4 Oct 2015 23:39:25 -0400 Subject: avfilter/all: propagate errors of functions from avfilter/formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Many of the functions from avfilter/formats can return errors, usually AVERROR(ENOMEM). This propagates the return values. All of these were found by using av_warn_unused_result, demonstrating its utility. Tested with FATE. I am least sure of the changes to avfilter/filtergraph, since I don't know what/how reduce_format is intended to behave and how it should react to errors. Fixes: CID 1325680, 1325679, 1325678. Reviewed-by: Michael Niedermayer Previous version Reviewed-by: Nicolas George Previous version Reviewed-by: Clément Bœsch Signed-off-by: Ganesh Ajjanagadde --- libavfilter/vf_paletteuse.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libavfilter/vf_paletteuse.c') diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index f8350ac585..1225a660bb 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -132,6 +132,7 @@ static int query_formats(AVFilterContext *ctx) static const enum AVPixelFormat in_fmts[] = {AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE}; static const enum AVPixelFormat inpal_fmts[] = {AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE}; static const enum AVPixelFormat out_fmts[] = {AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE}; + int ret; AVFilterFormats *in = ff_make_format_list(in_fmts); AVFilterFormats *inpal = ff_make_format_list(inpal_fmts); AVFilterFormats *out = ff_make_format_list(out_fmts); @@ -141,9 +142,10 @@ static int query_formats(AVFilterContext *ctx) av_freep(&out); return AVERROR(ENOMEM); } - ff_formats_ref(in, &ctx->inputs[0]->out_formats); - ff_formats_ref(inpal, &ctx->inputs[1]->out_formats); - ff_formats_ref(out, &ctx->outputs[0]->in_formats); + if ((ret = ff_formats_ref(in , &ctx->inputs[0]->out_formats)) < 0 || + (ret = ff_formats_ref(inpal, &ctx->inputs[1]->out_formats)) < 0 || + (ret = ff_formats_ref(out , &ctx->outputs[0]->in_formats)) < 0) + return ret; return 0; } -- cgit v1.2.3