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

Make lazy-loader safe for nil objectification

This commit is contained in:
Behdad Esfahbod 2018-08-02 01:37:57 -07:00
parent 6404c49d07
commit ee35af738b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-machinery-private.hh
View File

@ -656,6 +656,8 @@ struct hb_lazy_loader_t : hb_base_lazy_loader_t<WheresFace, hb_lazy_loader_t<Whe
{ {
static inline T *create (hb_face_t *face) static inline T *create (hb_face_t *face)
{ {
if (unlikely (!face))
return const_cast<T *> (&Null(T));
T *p = (T *) calloc (1, sizeof (T)); T *p = (T *) calloc (1, sizeof (T));
if (unlikely (!p)) if (unlikely (!p))
p = const_cast<T *> (&Null(T)); p = const_cast<T *> (&Null(T));
@ -678,6 +680,8 @@ struct hb_table_lazy_loader_t : hb_base_lazy_loader_t<WheresFace, hb_table_lazy_
{ {
static inline hb_blob_t *create (hb_face_t *face) static inline hb_blob_t *create (hb_face_t *face)
{ {
if (unlikely (!face))
return hb_blob_get_empty ();
return hb_sanitize_context_t ().reference_table<T> (face); return hb_sanitize_context_t ().reference_table<T> (face);
} }
static inline void destroy (hb_blob_t *p) static inline void destroy (hb_blob_t *p)