From 13e35edc81b6eb03e50c2911723ab6e8d9af89f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 29 Sep 2013 14:14:23 +0200
Subject: [PATCH] quartztext: add basic font-fallback mechanism instead of
crashing (close #9369)
---
modules/text_renderer/quartztext.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/text_renderer/quartztext.c b/modules/text_renderer/quartztext.c
index eb5da4aacaaf..837f02cf16ff 100644
--- a/modules/text_renderer/quartztext.c
+++ b/modules/text_renderer/quartztext.c
@@ -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,
--
GitLab