summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2021-06-19 07:03:40 +0200
committerWerner Lemberg <wl@gnu.org>2021-06-19 07:03:40 +0200
commitb460a50610320c425292518cb5f6341af234e2f9 (patch)
tree977199f3058ab330d76824b30f62cbb5bae3f14c
parent232243e7495d142f30d4e024f30eda9ca8655154 (diff)
downloadfreetype2-b460a50610320c425292518cb5f6341af234e2f9.tar.gz
[truetype] Fix integer overflow.
Reported as https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=35312 * src/truetype/ttinterp.c (Ins_JMPR): Use `ADD_LONG`.
-rw-r--r--ChangeLog10
-rw-r--r--src/truetype/ttinterp.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 522d084da..aaec6b1c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2021-06-19 Werner Lemberg <david@freetype.org>
+ [truetype] Fix integer overflow.
+
+ Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=35312
+
+ * src/truetype/ttinterp.c (Ins_JMPR): Use `ADD_LONG`.
+
+2021-06-19 Werner Lemberg <david@freetype.org>
+
[autofit] Prevent hinting if there are too many segments.
This speeds up handling of broken glyphs.
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 6747f940d..96b48a003 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -3593,7 +3593,7 @@
return;
}
- exc->IP += args[0];
+ exc->IP = ADD_LONG( exc->IP, args[0] );
if ( exc->IP < 0 ||
( exc->callTop > 0 &&
exc->IP > exc->callStack[exc->callTop - 1].Def->end ) )