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

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/04/04 11:59:09

Index: w32uniscribe.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32uniscribe.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- w32uniscribe.c      4 Apr 2008 07:58:28 -0000       1.3
+++ w32uniscribe.c      4 Apr 2008 11:59:09 -0000       1.4
@@ -563,6 +563,7 @@
   HFONT check_font, old_font;
   DWORD table;
   int i, retval = 0;
+  struct gcpro gcpro1;
 
   /* Check the spec is in the right format.  */
   if (!CONSP (otf_spec) || Flength (otf_spec) < 3)
@@ -599,6 +600,10 @@
   check_font = CreateFontIndirect (font);
   old_font = SelectObject (context, check_font);
 
+  /* Everything else is contained within otf_spec so should get
+     marked along with it.  */
+  GCPRO1 (otf_spec);
+
   /* Scan GSUB and GPOS tables.  */
   for (i = 0; i < 2; i++)
     {
@@ -676,7 +681,7 @@
         documentation in font_prop_validate_otf, so count them.  */
       n_match_features = 0;
       rest = features[i];
-      for (feature = XCAR (rest); CONSP (rest); feature = XCAR (rest))
+      for (feature = XCAR (rest); CONSP (rest); feature = CAR_SAFE (rest))
        {
          rest = XCDR (rest);
          if (!NILP (feature))