[FFmpeg-devel] [PATCH 1/8] avfilter/vf_w3fdif: Fix segfault on allocation error
Andreas Rheinhardt
andreas.rheinhardt at outlook.com
Thu Oct 7 12:09:50 EEST 2021
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
One could btw allocate the work lines jointly.
libavfilter/vf_w3fdif.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavfilter/vf_w3fdif.c b/libavfilter/vf_w3fdif.c
index ea304164b6..c2ea76dfa3 100644
--- a/libavfilter/vf_w3fdif.c
+++ b/libavfilter/vf_w3fdif.c
@@ -275,7 +275,7 @@ static int config_input(AVFilterLink *inlink)
AVFilterContext *ctx = inlink->dst;
W3FDIFContext *s = ctx->priv;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
- int ret, i, depth;
+ int ret, i, depth, nb_threads;
if ((ret = av_image_fill_linesizes(s->linesize, inlink->format, inlink->w)) < 0)
return ret;
@@ -289,10 +289,11 @@ static int config_input(AVFilterLink *inlink)
}
s->nb_planes = av_pix_fmt_count_planes(inlink->format);
- s->nb_threads = ff_filter_get_nb_threads(ctx);
- s->work_line = av_calloc(s->nb_threads, sizeof(*s->work_line));
+ nb_threads = ff_filter_get_nb_threads(ctx);
+ s->work_line = av_calloc(nb_threads, sizeof(*s->work_line));
if (!s->work_line)
return AVERROR(ENOMEM);
+ s->nb_threads = nb_threads;
for (i = 0; i < s->nb_threads; i++) {
s->work_line[i] = av_calloc(FFALIGN(s->linesize[0], 32), sizeof(*s->work_line[0]));
--
2.30.2
More information about the ffmpeg-devel
mailing list