(uniscribe_check_otf): Sanity check otf_spec.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index fd10b9fc0f7..ed29955efe9 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -564,6 +564,10 @@ int uniscribe_check_otf (font, otf_spec)
   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 @@ int uniscribe_check_otf (font, otf_spec)
       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);