Update Android port

* src/sfnt.c (ISECT): Micro-optimize this instruction.
* src/sfntfont.c (sfnt_parse_style): Avoid GC safety problem.

diff --git a/src/sfnt.c b/src/sfnt.c
index 10321a09c8bcb55392ba5f5f1f7a953d9dde580d..3f1639b37345ebb959da2251f4ecd7879b612df1 100644 (file)
--- a/src/sfnt.c
+++ b/src/sfnt.c
@@ -7019,11 +7019,13 @@ sfnt_interpret_trap (struct sfnt_interpreter *interpreter,
   {                                            \
     uint32_t a0, a1, b0, b1, p;                        \
                                                \
-    a0 = POP ();                               \
-    a1 = POP ();                               \
-    b0 = POP ();                               \
-    b1 = POP ();                               \
-    p = POP ();                                        \
+    CHECK_STACK_ELEMENTS (5);                  \
+                                               \
+    a0 = POP_UNCHECKED ();                     \
+    a1 = POP_UNCHECKED ();                     \
+    b0 = POP_UNCHECKED ();                     \
+    b1 = POP_UNCHECKED ();                     \
+    p = POP_UNCHECKED ();                      \
                                                \
     sfnt_interpret_isect (interpreter,         \
                          a0, a1, b0, b1, p);   \

diff --git a/src/sfntfont.c b/src/sfntfont.c
index 72434d5b5d88ba45e9d5fbee76b3a1198e986d12..6927b1857210273e7416d6aa7acfece12c2feec0 100644 (file)
--- a/src/sfntfont.c
+++ b/src/sfntfont.c
@@ -453,6 +453,7 @@ sfnt_parse_style (Lisp_Object style_name, struct sfnt_font_desc *desc)
 {
   char *style, *single, *saveptr;
   int i;
+  USE_SAFE_ALLOCA;
 
   /* Fill in default values.  slant seems to not be consistent with
      Fontconfig.  */
@@ -462,9 +463,9 @@ sfnt_parse_style (Lisp_Object style_name, struct sfnt_font_desc *desc)
 
   /* Split the style into tokens delimited by spaces.  Attempt to find
      a token specifying each of the weight, slant, or width attributes
-     using their respective descriptions arrays as a reference.  GC
-     must not happen inside this block.  */
-  style = SSDATA (Fdowncase (style_name));
+     using their respective descriptions arrays as a reference.  */
+
+  SAFE_ALLOCA_STRING (style, Fdowncase (style_name));
   saveptr = NULL;
 
   while ((single = strtok_r (style, " ", &saveptr)))
@@ -541,6 +542,8 @@ sfnt_parse_style (Lisp_Object style_name, struct sfnt_font_desc *desc)
     next:
       continue;
     }
+
+  SAFE_FREE ();
 }
 
 /* Parse the list of design languages in META, a font metadata table,