2007-08-21 Behdad Esfahbod <behdad@gnome.org>
Bug 463430 – Gets stuck while "formatting message"
* pango/opentype/harfbuzz-gpos.c (Lookup_PairPos1),
(Lookup_PairPos2), (Lookup_PairPos), (Do_ContextPos):
* pango/opentype/harfbuzz-gsub.c (Do_ContextSubst):
Change type of intermediate index variable from FT_UShort to
FT_ULong as it was overlowing with more than 65536 glyphs.
static FT_Error Lookup_PairPos1( GPOS_Instance* gpi,
HB_PairPosFormat1* ppf1,
HB_Buffer buffer,
- FT_UShort first_pos,
+ FT_ULong first_pos,
FT_UShort index,
FT_UShort format1,
FT_UShort format2 )
static FT_Error Lookup_PairPos2( GPOS_Instance* gpi,
HB_PairPosFormat2* ppf2,
HB_Buffer buffer,
- FT_UShort first_pos,
+ FT_ULong first_pos,
FT_UShort format1,
FT_UShort format2 )
{
int nesting_level )
{
FT_Error error;
- FT_UShort index, property, first_pos;
+ FT_UShort index, property;
+ FT_ULong first_pos;
HB_GPOSHeader* gpos = gpi->gpos;
HB_PairPos* pp = &st->pair;
return error;
if ( buffer->in_pos == buffer->in_length )
- return HB_Err_Not_Covered;
+ {
+ buffer->in_pos = first_pos;
+ return HB_Err_Not_Covered;
+ }
(buffer->in_pos)++;
+
}
switch ( pp->PosFormat )
int nesting_level )
{
FT_Error error;
- FT_UShort i, old_pos;
+ FT_ULong i, old_pos;
i = 0;
int nesting_level )
{
FT_Error error;
- FT_UShort i, old_pos;
+ FT_ULong i, old_pos;
i = 0;