ft: Convert an assert into an unlikely error return.

The assert depends upon good behaviour from fontconfig, which is no
guaranteed under memfault, so return an error instead.

1 files changed, 1 insertions, 3 deletions

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 82f0e659..ae097409 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -2624,13 +2624,11 @@ _cairo_ft_resolve_pattern (FcPattern		      *pattern,
     }
 
     status = _cairo_ft_unscaled_font_create_for_pattern (resolved, &unscaled);
-    if (unlikely (status)) {
+    if (unlikely (status || unscaled == NULL)) {
 	font_face = (cairo_font_face_t *)&_cairo_font_face_nil;
 	goto FREE_RESOLVED;
     }
 
-    assert (unscaled != NULL);
-
     _get_pattern_ft_options (resolved, &ft_options);
     font_face = _cairo_ft_font_face_create (unscaled, &ft_options);
     _cairo_unscaled_font_destroy (&unscaled->base);