From 3ddb06397195434207cd188506693626b8c57a32 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 16 Mar 2011 14:14:06 -0700 Subject: [PATCH] * font.c (font_unparse_fcname): Abort in an "impossible" situation instead of using an uninitialized var. --- src/ChangeLog | 3 +++ src/font.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index b056c08419e..210b756e0ee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-03-16 Paul Eggert + * 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 a9a381a828d..5df0510b518 100644 --- 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" */ -- 2.39.2