* font.c (font_unparse_fcname): Abort in an "impossible" situation

instead of using an uninitialized var.

diff --git a/src/ChangeLog b/src/ChangeLog
index b056c08419e55c3de376936c22108121e77887d4..210b756e0ee6d5c6724d95deb58363895632e38d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * font.c (font_unparse_fcname): Abort in an "impossible" situation
+       instead of using an uninitialized var.
+
        * character.h (FETCH_CHAR_ADVANCE): Rename locals to avoid shadowing.
 
        * font.c (font_unparse_xlfd): Don't mix pointers to variables with

diff --git a/src/font.c b/src/font.c
index a9a381a828ddbf746c98496e459fb816abb460f1..5df0510b51835293962dc7f741af905d90ee1f2a 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -1566,8 +1566,10 @@ font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
       point_size = -1;
       len += 21;               /* for ":pixelsize=NUM" */
     }
-  else if (FLOATP (val))
+  else
     {
+      if (! FLOATP (val))
+       abort ();
       pixel_size = -1;
       point_size = (int) XFLOAT_DATA (val);
       len += 11;               /* for "-NUM" */