aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2010-02-27 15:28:52 +0100
committerAndreas Schwab2010-02-27 15:28:52 +0100
commitdf7e1ea0871a6e2bf07347c163222a4025b7b1a5 (patch)
tree292d4797fada821ffc297a2e0522b0601cf09380 /src
parent8ff35869753b7ef1bd479d99fe685a47fa6b73ed (diff)
downloademacs-df7e1ea0871a6e2bf07347c163222a4025b7b1a5.tar.gz
emacs-df7e1ea0871a6e2bf07347c163222a4025b7b1a5.zip
* w32uniscribe.c (uniscribe_check_otf): Fix length check.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32uniscribe.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ac909cc7885..6cafe2f60a5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-02-27 Andreas Schwab <schwab@linux-m68k.org>
2
3 * w32uniscribe.c (uniscribe_check_otf): Fix length check.
4
12010-02-27 Chong Yidong <cyd@stupidchicken.com> 52010-02-27 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * font.c (font_parse_fcname): Recognize "Book", "Condensed", 7 * font.c (font_parse_fcname): Recognize "Book", "Condensed",
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index f2bd0f44b50..cfdf629ceee 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -666,7 +666,7 @@ int uniscribe_check_otf (font, otf_spec)
666 struct gcpro gcpro1; 666 struct gcpro gcpro1;
667 667
668 /* Check the spec is in the right format. */ 668 /* Check the spec is in the right format. */
669 if (!CONSP (otf_spec) || Flength (otf_spec) < 3) 669 if (!CONSP (otf_spec) || XINT (Flength (otf_spec)) < 3)
670 return 0; 670 return 0;
671 671
672 /* Break otf_spec into its components. */ 672 /* Break otf_spec into its components. */