har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_scale: Check ff_scale_adjust_dimensions() for failure

Browse Source 
Helps: CID1513722 Operands don't affect result

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2a8fb3c2cc07e741bca556eee8aea704fda4c33f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-07-08 22:42:44 +02:00
parent a579bc48ec
commit d63a35fcf1
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_scale.c
View File

@ -494,10 +494,13 @@ static int config_props(AVFilterLink *outlink)
outlink->w = scale->w; outlink->w = scale->w;
outlink->h = scale->h; outlink->h = scale->h;
ff_scale_adjust_dimensions(inlink, &outlink->w, &outlink->h, ret = ff_scale_adjust_dimensions(inlink, &outlink->w, &outlink->h,
scale->force_original_aspect_ratio, scale->force_original_aspect_ratio,
scale->force_divisible_by); scale->force_divisible_by);
if (ret < 0)
goto fail;
if (outlink->w > INT_MAX || if (outlink->w > INT_MAX ||
outlink->h > INT_MAX || outlink->h > INT_MAX ||
(outlink->h * inlink->w) > INT_MAX || (outlink->h * inlink->w) > INT_MAX ||