ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/scale_eval: Use 64bit, check values in ff_scale_adjust_dimensions()

Browse Source 
Found by reviewing CID1513722 Operands don't affect result

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

9
libavfilter/scale_eval.c
View File

@ -114,7 +114,7 @@ int ff_scale_adjust_dimensions(AVFilterLink *inlink,
int *ret_w, int *ret_h,
int force_original_aspect_ratio, int force_divisible_by)
{
int w, h;
int64_t w, h;
int factor_w, factor_h;
w = *ret_w;
@ -148,8 +148,8 @@ int ff_scale_adjust_dimensions(AVFilterLink *inlink,
* dimensions so that it is not divisible by the set factors anymore
* unless force_divisible_by is defined as well */
if (force_original_aspect_ratio) {
int tmp_w = av_rescale(h, inlink->w, inlink->h);
int tmp_h = av_rescale(w, inlink->h, inlink->w);
int64_t tmp_w = av_rescale(h, inlink->w, inlink->h);
int64_t tmp_h = av_rescale(w, inlink->h, inlink->w);
if (force_original_aspect_ratio == 1) {
w = FFMIN(tmp_w, w);
@ -170,6 +170,9 @@ int ff_scale_adjust_dimensions(AVFilterLink *inlink,
}
}
if ((int32_t)w != w || (int32_t)h != h)
return AVERROR(EINVAL);
*ret_w = w;
*ret_h = h;

2
libavfilter/scale_eval.h
View File

@ -40,7 +40,7 @@ int ff_scale_eval_dimensions(void *ctx,
* or both of the evaluated values are of the form '-n' or if
* force_original_aspect_ratio is set.
*
* Returns 0.
* Returns negative error code on error or non negative on success
*/
int ff_scale_adjust_dimensions(AVFilterLink *inlink,
int *ret_w, int *ret_h,