diff options
| author | Werner Lemberg <wl@gnu.org> | 2009-03-20 09:13:59 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2009-03-20 09:13:59 +0100 |
| commit | 9dbfac22bc0f4d92610834059acb380e6073b7a2 (patch) | |
| tree | 4200423d3fd57d06405c4a127c4432a1e41808d8 | |
| parent | 79972af4f0485a11dcb19551356c45245749fc5b (diff) | |
| download | freetype2-9dbfac22bc0f4d92610834059acb380e6073b7a2.tar.gz | |
Fix Savannah bug #25923.
* src/cache/ftccmap.c (FTC_CMAP_HASH): Fix typo.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/cache/ftccmap.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2009-03-20 Werner Lemberg <wl@gnu.org> + Fix Savannah bug #25923. + + * src/cache/ftccmap.c (FTC_CMAP_HASH): Fix typo. + +2009-03-20 Werner Lemberg <wl@gnu.org> + Protect against too large glyphs. Problem reported by Tavis Ormandy <taviso@google.com>. diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c index 4c6a7fd96..25e7e4821 100644 --- a/src/cache/ftccmap.c +++ b/src/cache/ftccmap.c @@ -4,7 +4,7 @@ /* */ /* FreeType CharMap cache (body) */ /* */ -/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */ +/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -88,7 +88,7 @@ /* compute a query/node hash */ #define FTC_CMAP_HASH( faceid, index, charcode ) \ ( FTC_FACE_ID_HASH( faceid ) + 211 * ( index ) + \ - ( (char_code) / FTC_CMAP_INDICES_MAX ) ) + ( (charcode) / FTC_CMAP_INDICES_MAX ) ) /* the charmap query */ typedef struct FTC_CMapQueryRec_ |