1 files changed, 99 insertions, 72 deletions

diff --git a/src/ftfont.c b/src/ftfont.c
index 419274a30aa..4c12ef5d3af 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -24,6 +24,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <fontconfig/fontconfig.h>
 #include <fontconfig/fcfreetype.h>
 
+#include <c-strcase.h>
+
 #include "lisp.h"
 #include "dispextern.h"
 #include "frame.h"
@@ -140,6 +142,12 @@ static struct
     { NULL }
   };
 
+static bool
+matching_prefix (char const *str, ptrdiff_t len, char const *pat)
+{
+  return len == strlen (pat) && c_strncasecmp (str, pat, len) == 0;
+}
+
 /* Dirty hack for handing ADSTYLE property.
 
    Fontconfig (actually the underlying FreeType) gives such ADSTYLE
@@ -171,18 +179,10 @@ get_adstyle_property (FcPattern *p)
     return Qnil;
   str = (char *) fcstr;
   for (end = str; *end && *end != ' '; end++);
-  if (*end)
-    {
-      char *newstr = alloca (end - str + 1);
-      memcpy (newstr, str, end - str);
-      newstr[end - str] = '\0';
-      end = newstr + (end - str);
-      str = newstr;
-    }
-  if (xstrcasecmp (str, "Regular") == 0
-      || xstrcasecmp (str, "Bold") == 0
-      || xstrcasecmp (str, "Oblique") == 0
-      || xstrcasecmp (str, "Italic") == 0)
+  if (matching_prefix (str, end - str, "Regular")
+      || matching_prefix (str, end - str, "Bold")
+      || matching_prefix (str, end - str, "Oblique")
+      || matching_prefix (str, end - str, "Italic"))
     return Qnil;
   adstyle = font_intern_prop (str, end - str, 1);
   if (font_style_to_value (FONT_WIDTH_INDEX, adstyle, 0) >= 0)
@@ -499,8 +499,8 @@ static Lisp_Object ftfont_open (struct frame *, Lisp_Object, int);
 static void ftfont_close (struct font *);
 static int ftfont_has_char (Lisp_Object, int);
 static unsigned ftfont_encode_char (struct font *, int);
-static int ftfont_text_extents (struct font *, unsigned *, int,
-                                struct font_metrics *);
+static void ftfont_text_extents (struct font *, unsigned *, int,
+                                 struct font_metrics *);
 static int ftfont_get_bitmap (struct font *, unsigned,
                               struct font_bitmap *, int);
 static int ftfont_anchor_point (struct font *, unsigned, int,
@@ -573,7 +573,8 @@ static int
 ftfont_get_charset (Lisp_Object registry)
 {
   char *str = SSDATA (SYMBOL_NAME (registry));
-  char *re = alloca (SBYTES (SYMBOL_NAME (registry)) * 2 + 1);
+  USE_SAFE_ALLOCA;
+  char *re = SAFE_ALLOCA (SBYTES (SYMBOL_NAME (registry)) * 2 + 1);
   Lisp_Object regexp;
   int i, j;
 
@@ -589,6 +590,7 @@ ftfont_get_charset (Lisp_Object registry)
     }
   re[j] = '\0';
   regexp = make_unibyte_string (re, j);
+  SAFE_FREE ();
   for (i = 0; fc_charset_table[i].name; i++)
     if (fast_c_string_match_ignore_case
         (regexp, fc_charset_table[i].name,
@@ -802,7 +804,7 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots
               *otspec = ftfont_get_open_type_spec (val);
               if (! *otspec)
                 return NULL;
-              strcat (otlayout, "otlayout:");
+              strcpy (otlayout, "otlayout:");
               OTF_TAG_STR ((*otspec)->script_tag, otlayout + 9);
               script = (*otspec)->script;
             }
@@ -1371,19 +1373,18 @@ ftfont_encode_char (struct font *font, int c)
   return (code > 0 ? code : FONT_INVALID_CODE);
 }
 
-static int
-ftfont_text_extents (struct font *font, unsigned int *code, int nglyphs, struct font_metrics *metrics)
+static void
+ftfont_text_extents (struct font *font, unsigned int *code,
+                     int nglyphs, struct font_metrics *metrics)
 {
   struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
   FT_Face ft_face = ftfont_info->ft_size->face;
-  int width = 0;
-  int i;
+  int i, width = 0;
   bool first;
 
   if (ftfont_info->ft_size != ft_face->size)
     FT_Activate_Size (ftfont_info->ft_size);
-  if (metrics)
-    memset (metrics, 0, sizeof (struct font_metrics));
+
   for (i = 0, first = 1; i < nglyphs; i++)
     {
       if (FT_Load_Glyph (ft_face, code[i], FT_LOAD_DEFAULT) == 0)
@@ -1392,39 +1393,28 @@ ftfont_text_extents (struct font *font, unsigned int *code, int nglyphs, struct
 
           if (first)
             {
-              if (metrics)
-                {
-                  metrics->lbearing = m->horiBearingX >> 6;
-                  metrics->rbearing = (m->horiBearingX + m->width) >> 6;
-                  metrics->ascent = m->horiBearingY >> 6;
-                  metrics->descent = (m->height - m->horiBearingY) >> 6;
-                }
+              metrics->lbearing = m->horiBearingX >> 6;
+              metrics->rbearing = (m->horiBearingX + m->width) >> 6;
+              metrics->ascent = m->horiBearingY >> 6;
+              metrics->descent = (m->height - m->horiBearingY) >> 6;
               first = 0;
             }
-          if (metrics)
-            {
-              if (metrics->lbearing > width + (m->horiBearingX >> 6))
-                metrics->lbearing = width + (m->horiBearingX >> 6);
-              if (metrics->rbearing
-                  < width + ((m->horiBearingX + m->width) >> 6))
-                metrics->rbearing
-                  = width + ((m->horiBearingX + m->width) >> 6);
-              if (metrics->ascent < (m->horiBearingY >> 6))
-                metrics->ascent = m->horiBearingY >> 6;
-              if (metrics->descent > ((m->height - m->horiBearingY) >> 6))
-                metrics->descent = (m->height - m->horiBearingY) >> 6;
-            }
+          if (metrics->lbearing > width + (m->horiBearingX >> 6))
+            metrics->lbearing = width + (m->horiBearingX >> 6);
+          if (metrics->rbearing
+              < width + ((m->horiBearingX + m->width) >> 6))
+            metrics->rbearing
+              = width + ((m->horiBearingX + m->width) >> 6);
+          if (metrics->ascent < (m->horiBearingY >> 6))
+            metrics->ascent = m->horiBearingY >> 6;
+          if (metrics->descent > ((m->height - m->horiBearingY) >> 6))
+            metrics->descent = (m->height - m->horiBearingY) >> 6;
           width += m->horiAdvance >> 6;
         }
       else
-        {
-          width += font->space_width;
-        }
+        width += font->space_width;
     }
-  if (metrics)
-    metrics->width = width;
-
-  return width;
+  metrics->width = width;
 }
 
 static int
@@ -1700,7 +1690,8 @@ ftfont_check_otf (MFLTFont *font, MFLTOtfSpec *spec)
         else if (! otf)
           return 0;
         for (n = 1; spec->features[i][n]; n++);
-        tags = alloca (sizeof (OTF_Tag) * n);
+        USE_SAFE_ALLOCA;
+        SAFE_NALLOCA (tags, 1, n);
         for (n = 0, negative = 0; spec->features[i][n]; n++)
           {
             if (spec->features[i][n] == 0xFFFFFFFF)
@@ -1710,16 +1701,17 @@ ftfont_check_otf (MFLTFont *font, MFLTOtfSpec *spec)
             else
               tags[n] = spec->features[i][n];
           }
-#ifdef M17N_FLT_USE_NEW_FEATURE
-        if (OTF_check_features (otf, i == 0, spec->script, spec->langsys,
-                                tags, n - negative) != 1)
-          return 0;
-#else  /* not M17N_FLT_USE_NEW_FEATURE */
-        if (n - negative > 0
-            && OTF_check_features (otf, i == 0, spec->script, spec->langsys,
-                                   tags, n - negative) != 1)
+        bool passed = true;
+#ifndef M17N_FLT_USE_NEW_FEATURE
+        passed = n - negative > 0;
+#endif
+        if (passed)
+          passed = (OTF_check_features (otf, i == 0, spec->script,
+                                        spec->langsys, tags, n - negative)
+                    != 1);
+        SAFE_FREE ();
+        if (passed)
           return 0;
-#endif  /* not M17N_FLT_USE_NEW_FEATURE */
       }
   return 1;
 #undef FEATURE_NONE
@@ -1811,11 +1803,15 @@ ftfont_drive_otf (MFLTFont *font,
   if (len == 0)
     return from;
   OTF_tag_name (spec->script, script);
+
+  char langsysbuf[5];
   if (spec->langsys)
     {
-      langsys = alloca (5);
+      langsys = langsysbuf;
       OTF_tag_name (spec->langsys, langsys);
     }
+
+  USE_SAFE_ALLOCA;
   for (i = 0; i < 2; i++)
     {
       char *p;
@@ -1823,10 +1819,11 @@ ftfont_drive_otf (MFLTFont *font,
       if (spec->features[i] && spec->features[i][1] != 0xFFFFFFFF)
         {
           for (j = 0; spec->features[i][j]; j++);
+          SAFE_NALLOCA (p, 6, j);
           if (i == 0)
-            p = gsub_features = alloca (6 * j);
+            gsub_features = p;
           else
-            p = gpos_features = alloca (6 * j);
+            gpos_features = p;
           for (j = 0; spec->features[i][j]; j++)
             {
               if (spec->features[i][j] == 0xFFFFFFFF)
@@ -1858,7 +1855,10 @@ ftfont_drive_otf (MFLTFont *font,
                                    gsub_features) < 0)
         goto simple_copy;
       if (out->allocated < out->used + otf_gstring.used)
-        return -2;
+        {
+          SAFE_FREE ();
+          return -2;
+        }
       features = otf->gsub->FeatureList.Feature;
       for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; )
         {
@@ -1947,7 +1947,10 @@ ftfont_drive_otf (MFLTFont *font,
   else if (out)
     {
       if (out->allocated < out->used + len)
-        return -2;
+        {
+          SAFE_FREE ();
+          return -2;
+        }
       for (i = 0; i < len; i++)
         out->glyphs[out->used++] = in->glyphs[from + i];
     }
@@ -1959,7 +1962,10 @@ ftfont_drive_otf (MFLTFont *font,
 
       if (OTF_drive_gpos_with_log (otf, &otf_gstring, script, langsys,
                                    gpos_features) < 0)
-        return to;
+        {
+          SAFE_FREE ();
+          return to;
+        }
       features = otf->gpos->FeatureList.Feature;
       x_ppem = ft_face->size->metrics.x_ppem;
       y_ppem = ft_face->size->metrics.y_ppem;
@@ -2081,7 +2087,10 @@ ftfont_drive_otf (MFLTFont *font,
     {
       if (OTF_drive_gpos_with_log (otf, &otf_gstring, script, langsys,
                                    gpos_features) < 0)
-        return to;
+        {
+          SAFE_FREE ();
+          return to;
+        }
       features = otf->gpos->FeatureList.Feature;
       for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used;
            i++, otfg++)
@@ -2101,9 +2110,11 @@ ftfont_drive_otf (MFLTFont *font,
               }
           }
     }
+  SAFE_FREE ();
   return to;
 
  simple_copy:
+  SAFE_FREE ();
   if (! out)
     return to;
   if (out->allocated < out->used + len)
@@ -2141,11 +2152,15 @@ ftfont_drive_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in,
   if (len == 0)
     return from;
   OTF_tag_name (spec->script, script);
+
+  char langsysbuf[5];
   if (spec->langsys)
     {
-      langsys = alloca (5);
+      langsys = langsysbuf;
       OTF_tag_name (spec->langsys, langsys);
     }
+
+  USE_SAFE_ALLOCA;
   for (i = 0; i < 2; i++)
     {
       char *p;
@@ -2153,10 +2168,11 @@ ftfont_drive_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in,
       if (spec->features[i] && spec->features[i][1] != 0xFFFFFFFF)
         {
           for (j = 0; spec->features[i][j]; j++);
+          SAFE_NALLOCA (p, 6, j);
           if (i == 0)
-            p = gsub_features = alloca (6 * j);
+            gsub_features = p;
           else
-            p = gpos_features = alloca (6 * j);
+            gpos_features = p;
           for (j = 0; spec->features[i][j]; j++)
             {
               if (spec->features[i][j] == 0xFFFFFFFF)
@@ -2188,7 +2204,10 @@ ftfont_drive_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in,
           < 0)
         goto simple_copy;
       if (out->allocated < out->used + otf_gstring.used)
-        return -2;
+        {
+          SAFE_FREE ();
+          return -2;
+        }
       for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; )
         {
           MFLTGlyph *g;
@@ -2239,7 +2258,10 @@ ftfont_drive_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in,
   else
     {
       if (out->allocated < out->used + len)
-        return -2;
+        {
+          SAFE_FREE ();
+          return -2;
+        }
       for (i = 0; i < len; i++)
         out->glyphs[out->used++] = in->glyphs[from + i];
     }
@@ -2251,7 +2273,10 @@ ftfont_drive_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in,
 
       if (OTF_drive_gpos (otf, &otf_gstring, script, langsys, gpos_features)
           < 0)
-        return to;
+        {
+          SAFE_FREE ();
+          return to;
+        }
 
       x_ppem = ft_face->size->metrics.x_ppem;
       y_ppem = ft_face->size->metrics.y_ppem;
@@ -2361,9 +2386,11 @@ ftfont_drive_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in,
             base = g;
         }
     }
+  SAFE_FREE ();
   return to;
 
  simple_copy:
+  SAFE_FREE ();
   if (out->allocated < out->used + len)
     return -2;
   font->get_metrics (font, in, from, to);