Fix NULL dereference

Reported by Jonathan Kew.  Face table handling needs to be redone
anyway, but fix this for now.
This commit is contained in:
Behdad Esfahbod 2010-08-16 14:36:27 -04:00
parent 258305c2a5
commit ed4acbde9c
1 changed files with 3 additions and 3 deletions

View File

@ -76,19 +76,19 @@ _hb_ot_layout_free (hb_ot_layout_t *layout)
static const GDEF&
_get_gdef (hb_face_t *face)
{
return likely (face->ot_layout->gdef) ? *face->ot_layout->gdef : Null(GDEF);
return likely (face->ot_layout && face->ot_layout->gdef) ? *face->ot_layout->gdef : Null(GDEF);
}
static const GSUB&
_get_gsub (hb_face_t *face)
{
return likely (face->ot_layout->gsub) ? *face->ot_layout->gsub : Null(GSUB);
return likely (face->ot_layout && face->ot_layout->gsub) ? *face->ot_layout->gsub : Null(GSUB);
}
static const GPOS&
_get_gpos (hb_face_t *face)
{
return likely (face->ot_layout->gpos) ? *face->ot_layout->gpos : Null(GPOS);
return likely (face->ot_layout && face->ot_layout->gpos) ? *face->ot_layout->gpos : Null(GPOS);
}