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

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/04/03 15:38:10

Index: w32uniscribe.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32uniscribe.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- w32uniscribe.c      3 Apr 2008 11:56:40 -0000       1.1
+++ w32uniscribe.c      3 Apr 2008 15:38:10 -0000       1.2
@@ -564,6 +564,10 @@
   DWORD table;
   int i, retval = 0;
 
+  /* Check the spec is in the right format.  */
+  if (!CONSP (otf_spec) || Flength (val) < 3)
+    return 0;
+
   /* Break otf_spec into its components.  */
   script = XCAR (otf_spec);
   rest = XCDR (otf_spec);
@@ -609,6 +613,10 @@
       if (NILP (features[i]))
        continue;
 
+      /* If features is not a cons, this font spec is messed up.  */
+      if (!CONSP (features[i]))
+       goto no_support;
+
       /* Read GPOS/GSUB header.  */
       OTF_INT16_VAL (tbl, 4, &scriptlist_table);
       OTF_INT16_VAL (tbl, 6, &feature_table);