ref: 5b86f53dd60c7545dcea75684561199ac3d3e90f
parent: cc288e383bbb95442f3ed72539917323bd1dabbf
author: Werner Lemberg <[email protected]>
date: Tue Nov 6 06:08:41 EST 2018
[psaux] Fix timeout in old CFF engine. Reported as https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11260 * src/psaux/cffdecode.c (cff_decoder_parse_charstrings) <cff_op_sqrt> [CFF_CONFIG_OPTION_OLD_ENGINE]: Fix potential endless loop.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-11-06 Werner Lemberg <[email protected]>
+
+ [psaux] Fix timeout in old CFF engine.
+
+ Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11260
+
+ * src/psaux/cffdecode.c (cff_decoder_parse_charstrings)
+ <cff_op_sqrt> [CFF_CONFIG_OPTION_OLD_ENGINE]: Fix potential endless
+ loop.
+
2018-11-04 Alexei Podtelezhnikov <[email protected]>
* src/truetype/ttgxvar.c: Use enum definitions.
--- a/src/psaux/cffdecode.c
+++ b/src/psaux/cffdecode.c
@@ -1748,7 +1748,10 @@
case cff_op_sqrt:
FT_TRACE4(( " sqrt\n" ));
- if ( args[0] > 0 )
+ /* without upper limit the loop below might not finish */
+ if ( args[0] > 0x7FFFFFFFL )
+ args[0] = 46341;
+ else if ( args[0] > 0 )
{
FT_Fixed root = args[0];
FT_Fixed new_root;