summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Tytgat <John.Tytgat@esko.com>2011-02-19 07:11:17 +0100
committerWerner Lemberg <wl@gnu.org>2011-02-19 07:11:17 +0100
commit18fffa456ecdfad39a0d25ba10b05a5e67f8a12c (patch)
treee30531cda00c85b9a3acf471f5179ed289298a7d
parentc5bda503b9b15bdd042e2c9696f2b1975f49d98c (diff)
[cff] Fix subset prefix removal.
* src/cff/cffobjs.c (remove_subset_prefix): Update length after subset prefix removal.
-rw-r--r--ChangeLog7
-rw-r--r--src/cff/cffobjs.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 35bf2afc..8bec3929 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-19 John Tytgat <John.Tytgat@esko.com>
+
+ [cff] Fix subset prefix removal.
+
+ * src/cff/cffobjs.c (remove_subset_prefix): Update length after
+ subset prefix removal.
+
2011-02-13 Bradley Grainger <bgrainger@logos.com>
Add inline assembly version of FT_MulFix for MSVC.
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 1cd35c96..768cd968 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -4,8 +4,7 @@
/* */
/* OpenType objects manager (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */
-/* 2010 by */
+/* Copyright 1996-2011 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -421,6 +420,7 @@
{
for ( idx = 7; idx < length; idx++ )
name[idx - 7] = name[idx];
+ length -= 7;
}
}
else