forked from minhngoc25a/freetype2
Fix Savannah bug #30236.
* src/sfnt/ttcmap.c (tt_face_build_cmaps): Improve check for pointer to `cmap_table'.
This commit is contained in:
parent
3cf87f4d27
commit
8b1c34da4c
|
@ -1,3 +1,10 @@
|
||||||
|
2010-06-24 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
Fix Savannah bug #30236.
|
||||||
|
|
||||||
|
* src/sfnt/ttcmap.c (tt_face_build_cmaps): Improve check for pointer
|
||||||
|
to `cmap_table'.
|
||||||
|
|
||||||
2010-06-24 Werner Lemberg <wl@gnu.org>
|
2010-06-24 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
Fix Savannah bug #30235.
|
Fix Savannah bug #30235.
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* TrueType character mapping table (cmap) support (body). */
|
/* TrueType character mapping table (cmap) support (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */
|
/* Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -3392,11 +3392,12 @@
|
||||||
FT_Byte* limit = table + face->cmap_size;
|
FT_Byte* limit = table + face->cmap_size;
|
||||||
FT_UInt volatile num_cmaps;
|
FT_UInt volatile num_cmaps;
|
||||||
FT_Byte* volatile p = table;
|
FT_Byte* volatile p = table;
|
||||||
FT_Library library = FT_FACE_LIBRARY(face);
|
FT_Library library = FT_FACE_LIBRARY( face );
|
||||||
FT_UNUSED(library);
|
|
||||||
|
FT_UNUSED( library );
|
||||||
|
|
||||||
|
|
||||||
if ( p + 4 > limit )
|
if ( !p || p + 4 > limit )
|
||||||
return SFNT_Err_Invalid_Table;
|
return SFNT_Err_Invalid_Table;
|
||||||
|
|
||||||
/* only recognize format 0 */
|
/* only recognize format 0 */
|
||||||
|
|
Loading…
Reference in New Issue