diff options
| author | Geremy Condra <gcondra@google.com> | 2011-12-16 12:43:20 -0800 |
|---|---|---|
| committer | Geremy Condra <gcondra@google.com> | 2011-12-16 12:43:20 -0800 |
| commit | 27811904d8de0ce5591417812ca31163bf5aad60 (patch) | |
| tree | cb03f6111bcf07f311be09b462bbe1d7391a689f /include/freetype/internal/services | |
| parent | a56904260208e9306d661349cc2bddfad8f29019 (diff) | |
| download | android_external_freetype-27811904d8de0ce5591417812ca31163bf5aad60.tar.gz android_external_freetype-27811904d8de0ce5591417812ca31163bf5aad60.tar.bz2 android_external_freetype-27811904d8de0ce5591417812ca31163bf5aad60.zip | |
Updated freetype to 2.4.8
This change is to fix a vulnerability in 2.4.7 (CVE-2011-3439). It
is taken from http://b/issue?id=5700584.
Change-Id: I25a87999bc3ab44d7c7f59e7f04f56895d86bb5d
Diffstat (limited to 'include/freetype/internal/services')
| -rw-r--r-- | include/freetype/internal/services/svpsinfo.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/include/freetype/internal/services/svpsinfo.h b/include/freetype/internal/services/svpsinfo.h index 91ba91e..84d6a78 100644 --- a/include/freetype/internal/services/svpsinfo.h +++ b/include/freetype/internal/services/svpsinfo.h @@ -4,7 +4,7 @@ /* */ /* The FreeType PostScript info service (specification). */ /* */ -/* Copyright 2003, 2004, 2009 by */ +/* Copyright 2003, 2004, 2009, 2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -44,6 +44,13 @@ FT_BEGIN_HEADER (*PS_GetFontPrivateFunc)( FT_Face face, PS_PrivateRec* afont_private ); + typedef FT_Long + (*PS_GetFontValueFunc)( FT_Face face, + PS_Dict_Keys key, + FT_UInt idx, + void *value, + FT_Long value_len ); + FT_DEFINE_SERVICE( PsInfo ) { @@ -51,22 +58,25 @@ FT_BEGIN_HEADER PS_GetFontExtraFunc ps_get_font_extra; PS_HasGlyphNamesFunc ps_has_glyph_names; PS_GetFontPrivateFunc ps_get_font_private; + PS_GetFontValueFunc ps_get_font_value; }; #ifndef FT_CONFIG_OPTION_PIC #define FT_DEFINE_SERVICE_PSINFOREC(class_, get_font_info_, \ - ps_get_font_extra_, has_glyph_names_, get_font_private_) \ + ps_get_font_extra_, has_glyph_names_, get_font_private_, \ + get_font_value_) \ static const FT_Service_PsInfoRec class_ = \ { \ get_font_info_, ps_get_font_extra_, has_glyph_names_, \ - get_font_private_ \ + get_font_private_, get_font_value_ \ }; #else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_PSINFOREC(class_, get_font_info_, \ - ps_get_font_extra_, has_glyph_names_, get_font_private_) \ + ps_get_font_extra_, has_glyph_names_, get_font_private_, \ + get_font_value_) \ void \ FT_Init_Class_##class_( FT_Library library, \ FT_Service_PsInfoRec* clazz) \ @@ -76,6 +86,7 @@ FT_BEGIN_HEADER clazz->ps_get_font_extra = ps_get_font_extra_; \ clazz->ps_has_glyph_names = has_glyph_names_; \ clazz->ps_get_font_private = get_font_private_; \ + clazz->ps_get_font_value = get_font_value_; \ } #endif /* FT_CONFIG_OPTION_PIC */ |