# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 804637791 0
# Node ID 395a1d99820bdcce3b71f44c5f3e31d89e740110
# Parent  01a0910f198781b5399143b2ce79cd5ea60984c4
(compute_char_face): Use Fsafe_length.

diff -r 01a0910f1987 -r 395a1d99820b src/xfaces.c
--- a/src/xfaces.c	Sat Jul 01 22:28:16 1995 +0000
+++ b/src/xfaces.c	Sat Jul 01 22:29:51 1995 +0000
@@ -895,10 +895,13 @@
   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 @@
       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));