(compute_char_face): Use Fsafe_length.

diff --git a/src/xfaces.c b/src/xfaces.c
index efacf370c27e4a40d436d0fe882d9d9c374a8421..8872b724810d4d1f8903f3ebe63170c93f1a8269 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -895,10 +895,13 @@ compute_char_face (f, w, pos, region_beg, region_end, endptr, limit, mouse)
   if (CONSP (prop))
     {
       /* We have a list of faces, merge them in reverse order */
-      Lisp_Object length = Flength (prop);
-      int len = XINT (length);
+      Lisp_Object length;
+      int len;
       Lisp_Object *faces;
 
+      length = Fsafe_length (prop);
+      len = XFASTINT (length);
+
       /* Put them into an array */
       faces = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
       for (j = 0; j < len; j++)
@@ -932,10 +935,12 @@ compute_char_face (f, w, pos, region_beg, region_end, endptr, limit, mouse)
       if (CONSP (prop))
        {
          /* We have a list of faces, merge them in reverse order */
-         Lisp_Object length = Flength (prop);
-         int len = XINT (length);
+         Lisp_Object length;
+         int len;
          Lisp_Object *faces;
-         int i;
+
+         length = Fsafe_length (prop);
+         len = XFASTINT (length);
 
          /* Put them into an array */
          faces = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));