mirrors/ffmpeg
0
0 Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-28 10:04:37 +08:00
Code Activity

avfilter/vf_pad: do the x/y range check and centering in 64bit

Browse Source 
Fixes: Ilayk1MzOixN
Fixes: swarm-Signed-integer-overflow-in-pad-x-y-bounds-check-499261
Regression since: 57c3670896
Signed integer overflow Replicated through UnModified FFmpeg with UBSAN

Found-by: zhang xingxing <2388969553@qq.com>
The report suggested, among other options, widening the comparison.
The overflow in the centering was found during review of the fixes for the report.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer authored and michaelni committed 2026-10-19 23:51:00 +00:00
1 parent 94505b6444
commit 12ca9b6890
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
libavfilter/vf_pad.c
+4 -4
View File
@@ -180,10 +180,10 @@ static int config_input(AVFilterLink *inlink)
goto eval_fail;
s->x = var_values[VAR_X] = res;
if (s->x < 0 || s->x + inlink->w > s->w)
s->x = var_values[VAR_X] = (s->w - inlink->w) / 2;
if (s->y < 0 || s->y + inlink->h > s->h)
s->y = var_values[VAR_Y] = (s->h - inlink->h) / 2;
if (s->x < 0 || (int64_t)s->x + inlink->w > s->w)
s->x = var_values[VAR_X] = ((int64_t)s->w - inlink->w) / 2;
if (s->y < 0 || (int64_t)s->y + inlink->h > s->h)
s->y = var_values[VAR_Y] = ((int64_t)s->h - inlink->h) / 2;
s->w = ff_draw_round_to_sub(&s->draw, 0, -1, s->w);
s->h = ff_draw_round_to_sub(&s->draw, 1, -1, s->h);