]> git.sesse.net Git - vlc/commitdiff
quartztext: add basic font-fallback mechanism instead of crashing (close #9369)
authorFelix Paul Kühne <fkuehne@videolan.org>
Sun, 29 Sep 2013 12:14:23 +0000 (14:14 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Sun, 29 Sep 2013 12:14:45 +0000 (14:14 +0200)
modules/text_renderer/quartztext.c

index eb5da4aacaaf25d9de0ee7270b5ce05818d6c631..837f02cf16ffa6bd4b8efd2911d282f7f18cc32d 100644 (file)
@@ -534,8 +534,11 @@ static void setFontAttibutes(char *psz_fontname, int i_font_size, uint32_t i_fon
     CFStringRef p_cfString;
     CTFontRef   p_font;
 
-    // Handle font name and size
-    p_cfString = CFStringCreateWithCString(NULL,
+    // fallback on default
+    if (!psz_fontname)
+        psz_fontname = (char *)DEFAULT_FONT;
+
+    p_cfString = CFStringCreateWithCString(kCFAllocatorDefault,
                                             psz_fontname,
                                             kCFStringEncodingUTF8);
     p_font     = CTFontCreateWithName(p_cfString,