ref: d9b3e39484bbafbec3e42734c9b585e35485f2c1
parent: 45a3c76b547511fa9d97aca34b150a0663257375
author: suzuki toshiya <[email protected]>
date: Thu Aug 5 13:10:32 EDT 2010
[cff] Don't use any values in decoder after parsing error. * src/cff/cffgload.c (cff_slot_load): Skip the evaluations of the values in decoder, if cff_decoder_parse_charstrings() returns any error.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-05 suzuki toshiya <[email protected]>
+
+ [cff] Don't use any values in decoder after parsing error.
+
+ * src/cff/cffgload.c (cff_slot_load): Skip the evaluations
+ of the values in decoder, if cff_decoder_parse_charstrings()
+ returns any error.
+
2010-08-04 Werner Lemberg <[email protected]>
Fix Savannah bug #30644.
@@ -11,7 +19,7 @@
* devel/ftoption.h: Synchronize with
include/freetype/config/ftoption.h.
-2010-08-04 Suzuki, Toshiya (鈴木俊哉) <[email protected]>
+2010-08-04 suzuki toshiya <[email protected]>
[cff] Improve stack overflow test.
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -2731,48 +2731,53 @@
/* now load the unscaled outline */
error = cff_get_glyph_data( face, glyph_index,
&charstring, &charstring_len );
- if ( !error )
- {- error = cff_decoder_prepare( &decoder, size, glyph_index );
- if ( !error )
- {- error = cff_decoder_parse_charstrings( &decoder,
- charstring,
- charstring_len );
+ if ( error )
+ goto Glyph_Build_Finished;
- cff_free_glyph_data( face, &charstring, charstring_len );
+ error = cff_decoder_prepare( &decoder, size, glyph_index );
+ if ( error )
+ goto Glyph_Build_Finished;
+ error = cff_decoder_parse_charstrings( &decoder,
+ charstring,
+ charstring_len );
+ cff_free_glyph_data( face, &charstring, charstring_len );
+
+ if ( error )
+ goto Glyph_Build_Finished;
+
#ifdef FT_CONFIG_OPTION_INCREMENTAL
- /* Control data and length may not be available for incremental */
- /* fonts. */
- if ( face->root.internal->incremental_interface )
- {- glyph->root.control_data = 0;
- glyph->root.control_len = 0;
- }
- else
+ /* Control data and length may not be available for incremental */
+ /* fonts. */
+ if ( face->root.internal->incremental_interface )
+ {+ glyph->root.control_data = 0;
+ glyph->root.control_len = 0;
+ }
+ else
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
- /* We set control_data and control_len if charstrings is loaded. */
- /* See how charstring loads at cff_index_access_element() in */
- /* cffload.c. */
- {- CFF_Index csindex = &cff->charstrings_index;
+ /* We set control_data and control_len if charstrings is loaded. */
+ /* See how charstring loads at cff_index_access_element() in */
+ /* cffload.c. */
+ {+ CFF_Index csindex = &cff->charstrings_index;
- if ( csindex->offsets )
- {- glyph->root.control_data = csindex->bytes +
- csindex->offsets[glyph_index] - 1;
- glyph->root.control_len = charstring_len;
- }
- }
+ if ( csindex->offsets )
+ {+ glyph->root.control_data = csindex->bytes +
+ csindex->offsets[glyph_index] - 1;
+ glyph->root.control_len = charstring_len;
}
}
- /* save new glyph tables */
- cff_builder_done( &decoder.builder );
+ Glyph_Build_Finished:
+ /* save new glyph tables, if no error */
+ if ( !error )
+ cff_builder_done( &decoder.builder );
+ /* XXX: anything to do for broken glyph entry? */
}
#ifdef FT_CONFIG_OPTION_INCREMENTAL