Commit 396b11b840f84e8bff62f3c361d0b592e77ee703
2010-12-09T23:16:18
[cff] Allow `hlineto' and `vlineto' without arguments. We simply ignore such instructions. This is invalid, but it doesn't harm; and indeed, there exist such subsetted fonts in PDFs. Reported by Albert Astals Cid <aacid@kde.org>. * src/cff/cffgload.c (cff_decoder_parse_charstrings) [cff_op_hlineto]: Ignore instruction if there aren't any arguments on the stack.
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
diff --git a/ChangeLog b/ChangeLog
index b7aea52..579ae62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-09 Werner Lemberg <wl@gnu.org>
+
+ [cff] Allow `hlineto' and `vlineto' without arguments.
+
+ We simply ignore such instructions. This is invalid, but it doesn't
+ harm; and indeed, there exist such subsetted fonts in PDFs.
+
+ Reported by Albert Astals Cid <aacid@kde.org>.
+
+ * src/cff/cffgload.c (cff_decoder_parse_charstrings)
+ [cff_op_hlineto]: Ignore instruction if there aren't any arguments
+ on the stack.
+
2010-11-28 Werner Lemberg <wl@gnu.org>
* Version 2.4.4 released.
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index e99ee70..99c5b0c 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -1438,9 +1438,14 @@
FT_TRACE4(( op == cff_op_hlineto ? " hlineto\n"
: " vlineto\n" ));
- if ( num_args < 1 )
+ if ( num_args < 0 )
goto Stack_Underflow;
+ /* there exist subsetted fonts (found in PDFs) */
+ /* which call `hlineto' without arguments */
+ if ( num_args == 0 )
+ break;
+
if ( cff_builder_start_point ( builder, x, y ) ||
check_points( builder, num_args ) )
goto Fail;