Import upstream version 1.9.8

1 files changed, 2 insertions, 4 deletions

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 56f0d10..ae09740 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -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);