walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-ot-layout.cc
View File

@ -76,19 +76,19 @@ _hb_ot_layout_free (hb_ot_layout_t *layout)
static const GDEF& static const GDEF&
_get_gdef (hb_face_t *face) _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& static const GSUB&
_get_gsub (hb_face_t *face) _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& static const GPOS&
_get_gpos (hb_face_t *face) _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);
} }