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 /src/base/fttype1.c | |
| 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 'src/base/fttype1.c')
| -rw-r--r-- | src/base/fttype1.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/base/fttype1.c b/src/base/fttype1.c index 8f1e102..c30124f 100644 --- a/src/base/fttype1.c +++ b/src/base/fttype1.c @@ -4,7 +4,7 @@ /* */
/* FreeType utility file for PS names support (body). */
/* */
-/* Copyright 2002, 2003, 2004 by */
+/* Copyright 2002-2004, 2011 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -90,5 +90,25 @@ return error;
}
+/* documentation is in t1tables.h */
+FT_EXPORT_DEF( FT_Long )
+FT_Get_PS_Font_Value( FT_Face face,
+ PS_Dict_Keys key,
+ FT_UInt idx,
+ void *value,
+ FT_Long value_len )
+{
+ FT_Int result = 0;
+ FT_Service_PsInfo service = NULL;
+
+ if ( face )
+ {
+ FT_FACE_FIND_SERVICE( face, service, POSTSCRIPT_INFO );
+ if ( service && service->ps_get_font_value )
+ result = service->ps_get_font_value( face, key, idx,
+ value, value_len );
+ }
+ return result;
+}
/* END */
|