diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2024-07-08 22:42:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2024-07-21 16:34:31 +0200 |
| commit | 2a8fb3c2cc07e741bca556eee8aea704fda4c33f (patch) | |
| tree | fccd37b0442865bd1e2aee2df19a12e1b4fc816c | |
| parent | ad9df8bcfebc1085cb8b42dae9ab688af824cdab (diff) | |
| download | ffmpeg-2a8fb3c2cc07e741bca556eee8aea704fda4c33f.tar.gz | |
avfilter/vf_scale: Check ff_scale_adjust_dimensions() for failure
Helps: CID1513722 Operands don't affect result
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavfilter/vf_scale.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index ae7356fd7b..680d264ec9 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -638,10 +638,13 @@ static int config_props(AVFilterLink *outlink) outlink->w = scale->w; 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_divisible_by); + if (ret < 0) + goto fail; + if (outlink->w > INT_MAX || outlink->h > INT_MAX || (outlink->h * inlink->w) > INT_MAX || |