Merge branch 'coretext-nullref' into 'main'

Avoid null pointer dereference in ct_font_descriptor_get_traits. See merge request GNOME/pango!784
ousttrue · Dec 9, 2024 · 37143e9 · 37143e9
2 parents f1cc842 + 8133ece
commit 37143e9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
@@ -267,7 +267,7 @@ ct_font_descriptor_get_traits (CTFontDescriptorRef desc)
    */
   dict = CTFontDescriptorCopyAttribute (desc, kCTFontTraitsAttribute);
   cf_number = (CFNumberRef)CFDictionaryGetValue (dict, kCTFontSymbolicTrait);
-  if (!CFNumberGetValue (cf_number, kCFNumberSInt64Type, &traits))
+  if (!(cf_number && CFNumberGetValue (cf_number, kCFNumberSInt64Type, &traits)))
     traits = 0;
   CFRelease (dict);