summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2011-02-20 19:13:25 +0900
committersuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2011-02-20 19:14:25 +0900
commitae6d1d7b98880e90af9452d25e9cbdd4f9d97966 (patch)
tree869d9ef4c43e3f93c7b26d104581c51253ea9d42
parent7ad15d59265410139078d835181565b771e34c05 (diff)
[cache] Fix an off-by-one bug in FTC_Manager_RemoveFaceID().
Found by <ychen1392001@yahoo.com.cn>, see detail in http://lists.gnu.org/archive/html/freetype/2011-01/msg00023.html * src/cache/ftccache.c (FTC_Cache_RemoveFaceID): Check the node buckets[cache->p + cache->mask] too.
-rw-r--r--ChangeLog10
-rw-r--r--src/cache/ftccache.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 67f8fd17..d04bda34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-20 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+ [cache] Fix an off-by-one bug in FTC_Manager_RemoveFaceID().
+ Found by <ychen1392001@yahoo.com.cn>, see detail in
+
+ http://lists.gnu.org/archive/html/freetype/2011-01/msg00023.html
+
+ * src/cache/ftccache.c (FTC_Cache_RemoveFaceID): Check the node
+ buckets[cache->p + cache->mask] too.
+
2011-02-19 Kevin Kofler <kevin.kofler@chello.at>
Fall back to autohinting if a TTF/OTF doesn't contain any bytecode.
diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c
index 865fbb71..f01c403f 100644
--- a/src/cache/ftccache.c
+++ b/src/cache/ftccache.c
@@ -574,7 +574,7 @@
FTC_Node frees = NULL;
- count = cache->p + cache->mask;
+ count = cache->p + cache->mask + 1;
for ( i = 0; i < count; i++ )
{
FTC_Node* bucket = cache->buckets + i;