[Emacs-diffs] Changes to emacs/src/font.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/05/22 05:20:55

Index: font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- font.c      22 May 2008 02:20:16 -0000      1.24
+++ font.c      22 May 2008 05:20:54 -0000      1.25
@@ -500,13 +500,16 @@
   if (INTEGERP (val))
     {
       n = XINT (val);
-      if ((n & 0xFF)
+      if (((n >> 4) & 0xF)
          >= ASIZE (AREF (font_style_table, prop - FONT_WEIGHT_INDEX)))
        val = Qerror;
       else
        {
-         Lisp_Object elt = AREF (AREF (font_style_table, prop - 
FONT_WEIGHT_INDEX), n & 0xFF);
-         if (XINT (XCDR (elt)) != (n >> 8))
+         Lisp_Object elt = AREF (AREF (font_style_table, prop - 
FONT_WEIGHT_INDEX), (n >> 4) & 0xF);
+
+         if ((n & 0xF) + 1 >= ASIZE (elt))
+           val = Qerror;
+         else if (XINT (AREF (elt, 0)) != (n >> 8))
            val = Qerror;
        }
     }