RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 04:17:05 +00:00
Code Issues Projects Releases Wiki Activity

lavfi/vf_zscale: fix tmp buffer ptr alignment for zimg_filter_graph_process

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Pavel Koshevoy 2024-11-09 10:05:16 -07:00 committed by James Almer
parent f15fc27db5
commit 7b302f4db7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/vf_zscale.c
View File

@ -628,9 +628,12 @@ static int graphs_build(AVFrame *in, AVFrame *out, const AVPixFmtDescriptor *des
if (ret) if (ret)
return print_zimg_error(ctx); return print_zimg_error(ctx);
if (size > (SIZE_MAX - ZIMG_ALIGNMENT))
return AVERROR(ENOMEM);
if (s->tmp[job_nr]) if (s->tmp[job_nr])
av_freep(&s->tmp[job_nr]); av_freep(&s->tmp[job_nr]);
s->tmp[job_nr] = av_calloc(size, 1); s->tmp[job_nr] = av_mallocz(size + ZIMG_ALIGNMENT);
if (!s->tmp[job_nr]) if (!s->tmp[job_nr])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -750,7 +753,9 @@ static int filter_slice(AVFilterContext *ctx, void *data, int job_nr, int n_jobs
} }
if (!s->graph[job_nr]) if (!s->graph[job_nr])
return AVERROR(EINVAL); return AVERROR(EINVAL);
ret = zimg_filter_graph_process(s->graph[job_nr], &src_buf, &dst_buf, s->tmp[job_nr], 0, 0, 0, 0); ret = zimg_filter_graph_process(s->graph[job_nr], &src_buf, &dst_buf,
(uint8_t *)FFALIGN((uintptr_t)s->tmp[job_nr], ZIMG_ALIGNMENT),
0, 0, 0, 0);
if (ret) if (ret)
return print_zimg_error(ctx); return print_zimg_error(ctx);
@ -765,7 +770,9 @@ static int filter_slice(AVFilterContext *ctx, void *data, int job_nr, int n_jobs
if (!s->alpha_graph[job_nr]) if (!s->alpha_graph[job_nr])
return AVERROR(EINVAL); return AVERROR(EINVAL);
ret = zimg_filter_graph_process(s->alpha_graph[job_nr], &src_buf, &dst_buf, s->tmp[job_nr], 0, 0, 0, 0); ret = zimg_filter_graph_process(s->alpha_graph[job_nr], &src_buf, &dst_buf,
(uint8_t *)FFALIGN((uintptr_t)s->tmp[job_nr], ZIMG_ALIGNMENT),
0, 0, 0, 0);
if (ret) if (ret)
return print_zimg_error(ctx); return print_zimg_error(ctx);
} }