aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-25 19:17:15 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-25 19:17:15 +0000
commit431800a8a5c1d6ef95ae4df778184989de32f0ff (patch)
tree47f392e35e382f5e55c4bdd2259f311bb330d2fc
parentfont: use FT_Set_Pixel_Sizes() instead of FT_Set_Char_Size() (diff)
font: cleanup and return error when failing to load font file
-rw-r--r--font.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/font.c b/font.c
index 6739541c..8f7d6f78 100644
--- a/font.c
+++ b/font.c
@@ -139,8 +139,11 @@ from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx,
FT_Face ft_face;
FT_Error ft_err = FT_New_Face(ft_lib, (const char *)face_file, 0, &ft_face);
mtx_unlock(&ft_lock);
- if (ft_err != 0)
+ if (ft_err != 0) {
LOG_ERR("%s: failed to create FreeType face", face_file);
+ FcPatternDestroy(final_pattern);
+ return false;
+ }
if ((ft_err = FT_Set_Pixel_Sizes(ft_face, 0, size)) != 0) {
LOG_WARN("%s: failed to set character size", face_file);