summaryrefslogtreecommitdiff
path: root/core/src/fxge
diff options
context:
space:
mode:
authorBo Xu <bo_xu@foxitsoftware.com>2014-10-30 16:02:56 -0700
committerBo Xu <bo_xu@foxitsoftware.com>2014-10-30 16:02:56 -0700
commite9b38fa38de2c95d8260be31c57d9272c4d127ed (patch)
treeec25adaf409dab46a0fbe3b04af6374bf6d680d2 /core/src/fxge
parentf79a69c2513a9ee1431bd36c340e4b66bc2fd2d8 (diff)
downloadpdfium-e9b38fa38de2c95d8260be31c57d9272c4d127ed.tar.xz
Undo an old change in freetype to account for size of USHORT
BUG=418582 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/680833006
Diffstat (limited to 'core/src/fxge')
-rw-r--r--core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttcmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttcmap.c b/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttcmap.c
index 668ea7d0d5..b79d0ad508 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttcmap.c
+++ b/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttcmap.c
@@ -1451,7 +1451,7 @@
p = table + 8; /* skip language and start index */
count = TT_NEXT_USHORT( p );
- if ( table + length > valid->limit || length < 10 + count/* * 2 */) // Zhangxuefeng 2013.12.23. remove count multiply 2.
+ if ( table + length > valid->limit || length < 10 + count * 2 )
FT_INVALID_TOO_SHORT;
/* check glyph indices */