Merge pull request #661 from pshipton/freetype

Fix CVE-2023-2004 in freetype 2.12.1
ibmruntimes · Apr 17, 2023 · fcac2f2 · fcac2f2
2 parents b075c48 + 26ba128
commit fcac2f2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/jdk/src/share/native/sun/awt/libfreetype/src/truetype/ttgxvar.c b/jdk/src/share/native/sun/awt/libfreetype/src/truetype/ttgxvar.c
@@ -42,6 +42,7 @@
 #include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include FT_CONFIG_CONFIG_H
+#include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/tttags.h>
@@ -1140,7 +1141,7 @@
                 delta == 1 ? "" : "s",
                 vertical ? "VVAR" : "HVAR" ));
 
-    *avalue += delta;
+    *avalue = ADD_INT( *avalue, delta );
 
   Exit:
     return error;