From: Werner LEMBERG <wl@gnu.org>
Date: Tue, 11 Apr 2017 10:06:30 +0000 (+0300)
Subject: Avoid abort in ftfont.c due to faulty fonts
X-Git-Tag: emacs-26.0.90~521^2~654
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0eef8e9af7707b7bd01243033b9a48cb74fb8672;p=emacs.git

Avoid abort in ftfont.c due to faulty fonts

* src/ftfont.c (ftfont_get_metrics): Try loading the font without
hinting, before aborting.  (Bug#25945)
---

diff --git a/src/ftfont.c b/src/ftfont.c
index 6cabddda370..5600bde646d 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1546,7 +1546,8 @@ ftfont_get_metrics (MFLTFont *font, MFLTGlyphString *gstring,
 	  {
 	    FT_Glyph_Metrics *m;
 
-	    if (FT_Load_Glyph (ft_face, g->g.code, FT_LOAD_DEFAULT) != 0)
+	    if (FT_Load_Glyph (ft_face, g->g.code, FT_LOAD_DEFAULT) != 0
+		&& FT_Load_Glyph (ft_face, g->g.code, FT_LOAD_NO_HINTING) != 0)
 	      emacs_abort ();
 	    m = &ft_face->glyph->metrics;
 	    if (flt_font_ft->matrix)