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/ftbase.h | |
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/ftbase.h')
-rw-r--r-- | src/base/ftbase.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/base/ftbase.h b/src/base/ftbase.h index 6375613..516f4bb 100644 --- a/src/base/ftbase.h +++ b/src/base/ftbase.h @@ -49,7 +49,8 @@ FT_BEGIN_HEADER FT_Face *aface ); -#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK +#if defined( FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK ) && \ + ( !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON ) ) /* Mac OS X/Darwin kernel often changes recommended method to access */ /* the resource fork and older methods makes the kernel issue the */ /* warning of deprecated method. To calm it down, the methods based */ @@ -57,7 +58,7 @@ FT_BEGIN_HEADER /* the case the resource is opened but found to lack a font in it. */ FT_LOCAL( FT_Bool ) raccess_rule_by_darwin_vfs( FT_UInt rule_index ); -#endif /* FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK */ +#endif FT_END_HEADER |