[FFmpeg-cvslog] avfilter/vf_scale: Check ff_scale_adjust_dimensions() for failure
Michael Niedermayer
git at videolan.org
Sun Jul 21 18:18:12 EEST 2024
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 8 22:42:44 2024 +0200| [2a8fb3c2cc07e741bca556eee8aea704fda4c33f] | committer: Michael Niedermayer
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a8fb3c2cc07e741bca556eee8aea704fda4c33f
---
libavfilter/vf_scale.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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 ||
More information about the ffmpeg-cvslog
mailing list