Commit b44e6c2035121ae923730b5d864450774640933c
2016-12-22T08:30:15
[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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
diff --git a/ChangeLog b/ChangeLog
index 861eca9..d5697da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2016-12-22 Werner Lemberg <wl@gnu.org>
+ [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 <wl@gnu.org>
+
[ftfuzzer] Always use Adobe CFF engine.
* src/tools/ftfuzzer/ftfuzzer.cc (FT_Global::FT_Global): Implement
diff --git a/src/cff/cf2intrp.c b/src/cff/cf2intrp.c
index 2bbbb33..9c059a1 100644
--- 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 */