From 6b40e4b1c2c5376f9ad819aacdd32d142fb5e67b Mon Sep 17 00:00:00 2001 From: Pip Cet Date: Sun, 31 May 2020 12:31:50 +0000 Subject: [PATCH] Handle the case that Cairo cannot find a font file (Bug#41627) * src/ftcrfont.c (ftcrfont_open): Handle non-NULL error returns from cairo_ft_font_face_create_for_pattern. --- src/ftcrfont.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ftcrfont.c b/src/ftcrfont.c index 7832d4f5ce..ec87ae3335 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c @@ -139,7 +139,8 @@ ftcrfont_open (struct frame *f, Lisp_Object entity, int pixel_size) FcPatternDestroy (pat); font_face = cairo_ft_font_face_create_for_pattern (match); - if (!font_face) + if (!font_face + || cairo_font_face_status (font_face) != CAIRO_STATUS_SUCCESS) { unblock_input (); FcPatternDestroy (match); -- 2.27.0.rc0