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/t1decode.c | |
| parent | f720f0dbcf012d6c984dbbefa0875ef9840458c6 (diff) | |
| download | android_external_freetype-replicant-6.0-0001.tar.gz android_external_freetype-replicant-6.0-0001.tar.bz2 android_external_freetype-replicant-6.0-0001.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/t1decode.c')
| -rw-r--r-- | src/psaux/t1decode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index 5811fcb..2e19928 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -512,7 +512,7 @@ break; case 12: - if ( ip >= limit ) + if ( ip > limit ) { FT_ERROR(( "t1_decoder_parse_charstrings:" " invalid escape (12+EOF)\n" )); @@ -669,7 +669,7 @@ if ( large_int ) FT_TRACE4(( " %ld", value )); else - FT_TRACE4(( " %ld", value / 65536 )); + FT_TRACE4(( " %ld", Fix2Int( value ) )); #endif *top++ = value; |