shithub: freetype+ttf2subf

Download patch

ref: b44e6c2035121ae923730b5d864450774640933c
parent: ada829717574e7cdbfe373e08dbb2e14ea4369ab
author: Werner Lemberg <[email protected]>
date: Thu Dec 22 03:30:15 EST 2016 

[cff] Protect against invalid `vsindex' and `blend' values.

Reported as

  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=305

* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdVSINDEX,
cf2_cmdBLEND>: Implement it.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2016-12-22  Werner Lemberg  <[email protected]>
 
+	[cff] Protect against invalid `vsindex' and `blend' values.
+
+	Reported as
+
+	  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=305
+
+	* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdVSINDEX,
+	cf2_cmdBLEND>: Implement it.
+
+2016-12-22  Werner Lemberg  <[email protected]>
+
 	[ftfuzzer] Always use Adobe CFF engine.
 
 	* src/tools/ftfuzzer/ftfuzzer.cc (FT_Global::FT_Global): Implement
--- a/src/cff/cf2intrp.c
+++ b/src/cff/cf2intrp.c
@@ -659,7 +659,13 @@
           goto exit;
         }
 
-        font->vsindex = (FT_UInt)cf2_stack_popInt( opStack );
+        {
+          FT_Int  temp = cf2_stack_popInt( opStack );
+
+
+          if ( temp >= 0 )
+            font->vsindex = (FT_UInt)temp;
+        }
         break;
 
       case cf2_cmdBLEND:
@@ -687,7 +693,12 @@
           }
 
           /* do the blend */
-          numBlends = (FT_UInt)cf2_stack_popInt( opStack );
+          {
+            FT_Int  temp = cf2_stack_popInt( opStack );
+
+
+            numBlends = temp > 0 ? (FT_UInt)temp : 0;
+          }
           cf2_doBlend( &font->blend, opStack, numBlends );
 
           font->blend.usedBV = TRUE;
@@ -1225,7 +1236,7 @@
                     idx = cf2_stack_popInt( opStack );
 
                     if ( idx >= 0 && idx < CF2_STORAGE_SIZE )
-                    cf2_stack_pushFixed( opStack, storage[idx] );
+                      cf2_stack_pushFixed( opStack, storage[idx] );
                   }
                   continue; /* do not clear the stack */