From 2a5c2322f195b0db1fbe2e67df3d91ff77ace6fe Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Mon, 27 Jun 2022 13:25:35 +0200
Subject: Fix for issue #454 : crash in Fl::get_font_name().

---
 src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
index ce2a7e253..e3b03b949 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
@@ -318,13 +318,16 @@ double Fl_Quartz_Graphics_Driver::width(unsigned int wc) {
 static void set_fontname_CoreText(Fl_Fontdesc *f) {
   CFStringRef cfname = CFStringCreateWithCString(NULL, f->name, kCFStringEncodingUTF8);
   CTFontRef ctfont = cfname ? CTFontCreateWithName(cfname, 0, NULL) : NULL;
-  if (cfname) CFRelease(cfname);
+  if (cfname) { CFRelease(cfname); cfname = NULL; }
   if (ctfont) {
     cfname = CTFontCopyFullName(ctfont);
     CFRelease(ctfont);
-    CFStringGetCString(cfname, f->fontname, ENDOFBUFFER, kCFStringEncodingUTF8);
-    CFRelease(cfname);
-  } else strlcpy(f->fontname, f->name, ENDOFBUFFER);
+    if (cfname) {
+      CFStringGetCString(cfname, f->fontname, ENDOFBUFFER, kCFStringEncodingUTF8);
+      CFRelease(cfname);
+    }
+  }
+  if (!cfname) strlcpy(f->fontname, f->name, ENDOFBUFFER);
 }
 #endif
 
-- 
cgit v1.2.3