fdo-mirrors/freetype
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/freetype/freetype.git synced 2025-12-20 05:10:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[autofit] Prevent signed integer overflow.

Browse source 
* src/autofit/aflatin.c (af_latin_stretch_top_tilde,
  af_latin_stretch_bottom_tilde, af_latin_align_top_tilde,
  af_latin_align_bottom_tilde,
  af_glyph_hints_apply_vertical_separation_adjustments): Use `ADD_LONG` and
  `SUB_LONG` for values that involve `FT_LONG_MAX` and `FT_LONG_MIN`.

Fixes issue #1363.
This commit is contained in:
Werner Lemberg 2025-09-28 08:09:48 +02:00
parent 7955c9b86a
commit 4334f009e7
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/autofit/aflatin.c
View file

@ -3269,9 +3269,9 @@
next_on = next_on->next;
if ( next_on->y > p->y && prev_on->y > p->y )
measurement = p->y - min_y;
measurement = SUB_LONG( p->y, min_y );
else if ( next_on->y < p->y && prev_on->y < p->y )
measurement = max_y - p->y;
measurement = SUB_LONG( max_y, p->y );
else
continue;
@ -3313,7 +3313,8 @@
/* We adjust the height of the diacritic only, which means */
/* we are never dealing with large numbers and can thus avoid */
/* `FT_MulFix`. */
p->y = ( ( p->y - min_y ) * target_height / height ) + min_y;
p->y = ADD_LONG( SUB_LONG( p->y, min_y ) * target_height / height,
min_y );
} while ( p != first_point );
@ -3370,9 +3371,9 @@
next_on = next_on->next;
if ( next_on->y > p->y && prev_on->y > p->y )
measurement = p->y - min_y;
measurement = SUB_LONG( p->y, min_y );
else if ( next_on->y < p->y && prev_on->y < p->y )
measurement = max_y - p->y;
measurement = SUB_LONG( max_y, p->y );
else
continue;
@ -3404,7 +3405,8 @@
do
{
p = p->next;
p->y = ( ( p->y - max_y ) * target_height / height ) + max_y;
p->y = ADD_LONG( SUB_LONG( p->y, max_y ) * target_height / height,
max_y );
} while ( p != first_point );
@ -3463,8 +3465,8 @@
/* Align bottom of the tilde to the grid. */
min_y_rounded = FT_PIX_ROUND( min_y );
delta = min_y_rounded - min_y;
height = max_y - min_y;
delta = SUB_LONG( min_y_rounded, min_y );
height = SUB_LONG( max_y, min_y );
/* If the tilde is less than 3 pixels tall, snap the center of it */
/* to the grid instead of the bottom to improve readability. */
@ -3503,8 +3505,8 @@
} while ( p != first_point );
max_y_rounded = FT_PIX_ROUND( max_y );
delta = max_y_rounded - max_y;
height = max_y - min_y;
delta = SUB_LONG( max_y_rounded, max_y );
height = SUB_LONG( max_y, min_y );
if ( height < 64 * 3 )
delta -= ( FT_PIX_ROUND( height ) - height ) / 2;
@ -3673,7 +3675,7 @@
high_min_y = hints->contour_y_minima[high_contour];
high_max_y = hints->contour_y_maxima[high_contour];
high_height = high_max_y - high_min_y;
high_height = SUB_LONG( high_max_y, high_min_y );
if ( high_height > accent_height_limit )
{
@ -3705,7 +3707,7 @@
/* We also check that the y minimum of the 'other' contour */
/* is below the high contour to avoid potential false hits */
/* with contours enclosed in the high one. */
distance = high_min_y - max_y;
distance = SUB_LONG( high_min_y, max_y );
if ( distance < 64 &&
distance < min_distance &&
min_y < high_min_y )
@ -3724,14 +3726,14 @@
tilde_min_y = hints->contour_y_minima[tilde_contour];
tilde_max_y = hints->contour_y_maxima[tilde_contour];
tilde_height = tilde_max_y - tilde_min_y;
tilde_height = SUB_LONG( tilde_max_y, tilde_min_y);
/* The vertical separation adjustment potentially undoes a */
/* tilde center alignment. If it would grid-align a tilde */
/* less than 3 pixels in height, shift additionally to */
/* re-center the tilde. */
pos = high_min_y + adjustment_amount;
pos = ADD_LONG( high_min_y, adjustment_amount );
if ( adjust_below_top && is_top_tilde )
pos += high_height;
@ -3764,7 +3766,7 @@
{
/* Value 8 is heuristic. */
FT_Pos height_delta = high_height / 8;
FT_Pos min_y_limit = high_min_y - height_delta;
FT_Pos min_y_limit = SUB_LONG( high_min_y, height_delta );
FT_TRACE4(( " Pushing high contour %ld units up\n",
@ -3784,7 +3786,7 @@
centering_adjustment ));
af_move_contours_up( hints,
min_y_limit + high_height,
ADD_LONG( min_y_limit, high_height ),
centering_adjustment );
}
}
@ -3838,7 +3840,7 @@
low_min_y = hints->contour_y_minima[low_contour];
low_max_y = hints->contour_y_maxima[low_contour];
low_height = low_max_y - low_min_y;
low_height = SUB_LONG( low_max_y, low_min_y );
if ( low_height > accent_height_limit )
{
@ -3863,7 +3865,7 @@
min_y = hints->contour_y_minima[contour];
max_y = hints->contour_y_maxima[contour];
distance = min_y - low_max_y;
distance = SUB_LONG( min_y, low_max_y );
if ( distance < 64 &&
distance < min_distance &&
max_y > low_max_y )
@ -3882,9 +3884,9 @@
tilde_min_y = hints->contour_y_minima[tilde_contour];
tilde_max_y = hints->contour_y_maxima[tilde_contour];
tilde_height = tilde_max_y - tilde_min_y;
tilde_height = SUB_LONG( tilde_max_y, tilde_min_y );
pos = low_max_y - adjustment_amount;
pos = SUB_LONG( low_max_y, adjustment_amount );
if ( adjust_above_bottom && is_bottom_tilde )
pos -= low_height;
@ -3915,7 +3917,7 @@
( calculated_amount <= 66 || adjustment_amount <= 66 ) )
{
FT_Pos height_delta = low_height / 8;
FT_Pos max_y_limit = low_max_y + height_delta;
FT_Pos max_y_limit = ADD_LONG( low_max_y, height_delta );
FT_TRACE4(( " Pushing low contour %ld units down\n",
@ -3929,7 +3931,7 @@
centering_adjustment ));
af_move_contours_down( hints,
max_y_limit - low_height,
SUB_LONG( max_y_limit, low_height ),
centering_adjustment );
}
}