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

avfilter/vf_vpp_qsv: Fix leak of AVFilterFormats on error

Browse Source 
The vpp_qsv's query_formats function allocated two AVFilterFormats,
before storing them permanently. If storing the first of them fails,
the function simply returns and the second leaks. This has been fixed by
only allocating the second AVFilterFormats structure after the first one
has been successfully stored.

Fixes Coverity issue #1422231.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit c4beb0783b)
This commit is contained in:
Andreas Rheinhardt 2020-08-07 05:54:34 +02:00
parent 5bc83dd89d
commit 4a95c96eb7
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/vf_vpp_qsv.c
View File

@ -489,7 +489,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
static int query_formats(AVFilterContext *ctx)
{
int ret;
AVFilterFormats *in_fmts, *out_fmts;
static const enum AVPixelFormat in_pix_fmts[] = {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NV12,
@ -505,16 +504,12 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};
in_fmts = ff_make_format_list(in_pix_fmts);
out_fmts = ff_make_format_list(out_pix_fmts);
ret = ff_formats_ref(in_fmts, &ctx->inputs[0]->out_formats);
ret = ff_formats_ref(ff_make_format_list(in_pix_fmts),
&ctx->inputs[0]->out_formats);
if (ret < 0)
return ret;
ret = ff_formats_ref(out_fmts, &ctx->outputs[0]->in_formats);
if (ret < 0)
return ret;
return 0;
return ff_formats_ref(ff_make_format_list(out_pix_fmts),
&ctx->outputs[0]->in_formats);
}
static av_cold void vpp_uninit(AVFilterContext *ctx)