Undo an old change in freetype to account for size of USHORT
authorBo Xu <bo_xu@foxitsoftware.com>
Thu, 30 Oct 2014 23:02:56 +0000 (16:02 -0700)
committerBo Xu <bo_xu@foxitsoftware.com>
Thu, 30 Oct 2014 23:02:56 +0000 (16:02 -0700)
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

index 668ea7d..b79d0ad 100644 (file)
     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 */