summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCody Russell <cody@jhu.edu>2014-09-28 15:47:46 -0500
committerCody Russell <cody@jhu.edu>2014-09-28 15:47:46 -0500
commitc2a40e3b35a37f76f353655d9220dd94156fb89c (patch)
tree5e367004cf75692deecedf4b68a3f3b94f216eef
parente0a21abf52a0b7588b1aa3357818948816ed9103 (diff)
downloadpango-c2a40e3b35a37f76f353655d9220dd94156fb89c.tar.gz
[coretext] NULL check in ct_font_descriptor_get_weight()
Ensure that CFDictionaryGetValue() didn't return NULL before we call CFNumberGetValue(). https://bugzilla.gnome.org/show_bug.cgi?id=736697
-rw-r--r--pango/pangocoretext-fontmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index 6044773e..9656fb8c 100644
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -298,7 +298,7 @@ ct_font_descriptor_get_weight (CTFontDescriptorRef desc)
cf_number = (CFNumberRef)CFDictionaryGetValue (dict,
kCTFontWeightTrait);
- if (CFNumberGetValue (cf_number, kCFNumberCGFloatType, &value))
+ if (cf_number != NULL && CFNumberGetValue (cf_number, kCFNumberCGFloatType, &value))
{
if (value < ct_weight_min || value > ct_weight_max)
{