提交 ed4acbde 编写于 作者: B Behdad Esfahbod

Fix NULL dereference

Reported by Jonathan Kew.  Face table handling needs to be redone
anyway, but fix this for now.
上级 258305c2
......@@ -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);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册