From e9b38fa38de2c95d8260be31c57d9272c4d127ed Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Thu, 30 Oct 2014 16:02:56 -0700 Subject: 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 --- core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttcmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') 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 */ -- cgit v1.2.3