minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

[smooth] Avoid integer overflow. 

Reported as

  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=36243

* src/smooth/ftgrays.c(ADD_LONG, SUB_LONG, MUL_LONG, NEG_LONG)
[STANDALONE_]: Removed, unused.
(ADD_INT) [STANDALONE_]: New macro.
(FT_INTEGRATE): Use ADD_INT.
This commit is contained in:
Werner Lemberg 2021-08-07 17:11:57 +02:00
parent 47cf8ebf4a
commit 18fc64e6a3
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/smooth/ftgrays.c
View File

@ -149,14 +149,8 @@
#define FT_INT_MAX INT_MAX
#define FT_ULONG_MAX ULONG_MAX
#define ADD_LONG( a, b ) \
(long)( (unsigned long)(a) + (unsigned long)(b) )
#define SUB_LONG( a, b ) \
(long)( (unsigned long)(a) - (unsigned long)(b) )
#define MUL_LONG( a, b ) \
(long)( (unsigned long)(a) * (unsigned long)(b) )
#define NEG_LONG( a ) \
(long)( -(unsigned long)(a) )
#define ADD_INT( a, b ) \
(int)( (unsigned int)(a) + (unsigned int)(b) )
#define ft_memset memset
@ -530,8 +524,9 @@ typedef ptrdiff_t FT_PtrDist;
#define CELL_IS_NULL( cell ) ( (cell)->x == CELL_MAX_X_VALUE )
#define FT_INTEGRATE( ras, a, b ) \
ras.cell->cover += (a), ras.cell->area += (a) * (TArea)(b)
#define FT_INTEGRATE( ras, a, b ) \
ras.cell->cover = ADD_INT( ras.cell->cover, a ), \
ras.cell->area = ADD_INT( ras.cell->area, (a) * (TArea)(b) )
typedef struct gray_TRaster_