[Git][freetype/freetype][master] [smooth] Avoid integer overflow.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 18fc64e6
  by Werner Lemberg at 2021-08-07T17:16:52+02:00

  [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.
  

1 changed file:

• src/smooth/ftgrays.c

Changes:

src/smooth/ftgrays.c

---

...	...	@@ -149,14 +149,8 @@
149	149	#define FT_INT_MAX INT_MAX
150	150	#define FT_ULONG_MAX ULONG_MAX
151	151
152		-#define ADD_LONG( a, b ) \
153		- (long)( (unsigned long)(a) + (unsigned long)(b) )
154		-#define SUB_LONG( a, b ) \
155		- (long)( (unsigned long)(a) - (unsigned long)(b) )
156		-#define MUL_LONG( a, b ) \
157		- (long)( (unsigned long)(a) * (unsigned long)(b) )
158		-#define NEG_LONG( a ) \
159		- (long)( -(unsigned long)(a) )
	152	+#define ADD_INT( a, b ) \
	153	+ (int)( (unsigned int)(a) + (unsigned int)(b) )
160	154
161	155
162	156	#define ft_memset memset
...	...	@@ -530,8 +524,9 @@ typedef ptrdiff_t FT_PtrDist;
530	524	#define CELL_IS_NULL( cell ) ( (cell)->x == CELL_MAX_X_VALUE )
531	525
532	526
533		-#define FT_INTEGRATE( ras, a, b ) \
534		- ras.cell->cover += (a), ras.cell->area += (a) * (TArea)(b)
	527	+#define FT_INTEGRATE( ras, a, b ) \
	528	+ ras.cell->cover = ADD_INT( ras.cell->cover, a ), \
	529	+ ras.cell->area = ADD_INT( ras.cell->area, (a) * (TArea)(b) )
535	530
536	531
537	532	typedef struct gray_TRaster_

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.