diff options
author | Jungshik Shin <jungshik@google.com> | 2016-09-18 03:50:36 -0700 |
---|---|---|
committer | Sean McCreary <mccreary@mcwest.org> | 2017-04-07 16:53:42 -0600 |
commit | 3ff870b9dbbd88173df82269d3c1cffb1eba2eda (patch) | |
tree | 0e443679e800bb442b2cbb2f7ae086b787ca65ff /src/psaux/psobjs.c | |
parent | f720f0dbcf012d6c984dbbefa0875ef9840458c6 (diff) | |
download | android_external_freetype-3ff870b9dbbd88173df82269d3c1cffb1eba2eda.tar.gz android_external_freetype-3ff870b9dbbd88173df82269d3c1cffb1eba2eda.tar.bz2 android_external_freetype-3ff870b9dbbd88173df82269d3c1cffb1eba2eda.zip |
Update FreeType from 2.6.2 to c38be52bf8de (2.7 + a few post-2.7 CLs)HEADreplicant-6.0-0002replicant-6.0-0001cm-13.0
http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=c38be52b
Keep all the configuration options as before.
Likewise, exclude unused files (Jamfiles, various mk files, builds/,
docs/, ChangeLog*, directories under src/ for disabled modules, etc).
Update README.android to record the configurations.
Besides, disable a new option (TT_CONFIG_OPTION_SUBPIXEL_HINTING) for
branches. Note that a bulk of changes in this CL come from the code to
implement this option.
BUG: 31470908
AOSP-Change-Id: I1ca90aec171d9580415b8531e2b767e9dd31164c
CVE-2016-10244
Change-Id: I4485d2ea543c52f8145ab23372cf3e5c7345879b
(cherry picked from commit 055aee28cedc3631434b2636fc6093c0d4d818ab)
Diffstat (limited to 'src/psaux/psobjs.c')
-rw-r--r-- | src/psaux/psobjs.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 1d3c7e6..c7cbc67 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -594,9 +594,6 @@ error = FT_THROW( Invalid_File_Format ); } - if ( cur > limit ) - cur = limit; - parser->error = error; parser->cursor = cur; } @@ -1232,17 +1229,15 @@ if ( result < 0 || (FT_UInt)result < max_objects ) { FT_ERROR(( "ps_parser_load_field:" - " expected %d integer%s in the %s subarray\n" + " expected %d integers in the %s subarray\n" " " " of /FontBBox in the /Blend dictionary\n", - max_objects, max_objects > 1 ? "s" : "", + max_objects, i == 0 ? "first" : ( i == 1 ? "second" : ( i == 2 ? "third" : "fourth" ) ) )); error = FT_THROW( Invalid_File_Format ); - - FT_FREE( temp ); goto Exit; } |