ref: 235b1e2fe6ca325f449c5a73c75432d62d73f524
parent: 827ca3bcf25b9e4dc2edf31381c0774e1d227285
author: Werner Lemberg <[email protected]>
date: Sun Apr 15 17:55:04 EDT 2018
[truetype]: Limit `SLOOP' bytecode argument to 16 bits. This fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7707 * src/truetype/ttinterp.c (Ins_SLOOP): Do it.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-04-15 Werner Lemberg <[email protected]>
+
+ [truetype]: Limit `SLOOP' bytecode argument to 16 bits.
+
+ This fixes
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7707
+
+ * src/truetype/ttinterp.c (Ins_SLOOP): Do it.
+
2018-04-14 Werner Lemberg <[email protected]>
[truetype] Integer overflow issues.
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -3289,7 +3289,10 @@
if ( args[0] < 0 )
exc->error = FT_THROW( Bad_Argument );
else
- exc->GS.loop = args[0];
+ {
+ /* we heuristically limit the number of loops to 16 bits */
+ exc->GS.loop = args[0] > 0xFFFFL ? 0xFFFFL : args[0];
+ }
}