2006-04-10 Behdad Esfahbod <behdad@gnome.org>
Fix minor bugs reported by the Coverity scan report.
* pango/opentype/harfbuzz-gdef.c (HB_GDEF_Build_ClassDefinition):
* pango/opentype/harfbuzz-gpos.c (HB_GPOS_Query_Scripts),
(HB_GPOS_Query_Languages), (HB_GPOS_Query_Features): Do not access
structs before we check them for nullity.
* pango/pango-layout.c (pango_layout_index_to_line),
(pango_layout_index_to_line_and_extents),
(pango_layout_index_to_pos): Check for invalid iterators outside the
loop, so we don't crash.
* pango/pango-layout.c (pango_layout_line_x_to_index): Set
char_trailing instead of trailing in one of too many paths. Should
have been a typo.
* pango/pangox.c (get_font_metrics_from_subfonts): Check for nullity
somewhere.
FT_UShort start, curr_glyph, curr_class;
FT_UShort n, m, count;
FT_Error error;
- FT_Memory memory = gdef->memory;
+ FT_Memory memory;
HB_ClassDefinition* gcd;
HB_ClassRangeRecord* gcrr;
if ( !gdef || !glyph_array || !class_array )
return FT_Err_Invalid_Argument;
+ memory = gdef->memory;
gcd = &gdef->GlyphClassDef;
/* We build a format 2 table */
FT_ULong** script_tag_list )
{
FT_Error error;
- FT_Memory memory = gpos->memory;
+ FT_Memory memory;
FT_UShort n;
FT_ULong* stl;
if ( !gpos || !script_tag_list )
return FT_Err_Invalid_Argument;
+ memory = gpos->memory;
sl = &gpos->ScriptList;
sr = sl->ScriptRecord;
FT_ULong** language_tag_list )
{
FT_Error error;
- FT_Memory memory = gpos->memory;
+ FT_Memory memory;
FT_UShort n;
FT_ULong* ltl;
if ( !gpos || !language_tag_list )
return FT_Err_Invalid_Argument;
+ memory = gpos->memory;
sl = &gpos->ScriptList;
sr = sl->ScriptRecord;
{
FT_UShort n;
FT_Error error;
- FT_Memory memory = gpos->memory;
+ FT_Memory memory;
FT_ULong* ftl;
HB_ScriptList* sl;
if ( !gpos || !feature_tag_list )
return FT_Err_Invalid_Argument;
+ memory = gpos->memory;
sl = &gpos->ScriptList;
sr = sl->ScriptRecord;