From 5ec45dd37caa8a87ce2689a66272ba8a343fe6ba Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 11 Aug 2014 17:46:12 -0400 Subject: [PATCH] [coretext] Minor It's hard to handle all possible NULL returns from CoreText. Add one more... --- src/hb-coretext.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 54691016e..309e6214b 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc @@ -105,8 +105,11 @@ _hb_coretext_shaper_face_data_create (hb_face_t *face) DEBUG_MSG (CORETEXT, face, "Face has empty blob"); CGDataProviderRef provider = CGDataProviderCreateWithData (blob, blob_data, blob_length, &release_data); - data = CGFontCreateWithDataProvider (provider); - CGDataProviderRelease (provider); + if (likely (provider)) + { + data = CGFontCreateWithDataProvider (provider); + CGDataProviderRelease (provider); + } } if (unlikely (!data)) { @@ -558,7 +561,6 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, CFRelease (attributes); range->font = CTFontCreateCopyWithAttributes (font_data->ct_font, 0.0, NULL, font_desc); - CFRelease (font_desc); } else