From 5081674c5f3c2c7bcf49bc48f8618dd091325c9d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 22 Oct 2016 19:16:08 +0200 Subject: [PATCH] [truetype] Fix SCANTYPE instruction (#49394). * src/truetype/ttinterp.c (Ins_SCANTYPE): Only use lower 16bits. --- ChangeLog | 6 ++++++ src/truetype/ttinterp.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b12c2049..b1239f574 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-10-22 Werner Lemberg + + [truetype] Fix SCANTYPE instruction (#49394). + + * src/truetype/ttinterp.c (Ins_SCANTYPE): Only use lower 16bits. + 2016-10-22 Werner Lemberg [sfnt] Improve handling of invalid post 2.5 tables [#49393]. diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 2bd3fbca4..230b1308e 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -5173,14 +5173,14 @@ /* */ /* SCANTYPE[]: SCAN TYPE */ /* Opcode range: 0x8D */ - /* Stack: uint32? --> */ + /* Stack: uint16 --> */ /* */ static void Ins_SCANTYPE( TT_ExecContext exc, FT_Long* args ) { if ( args[0] >= 0 ) - exc->GS.scan_type = (FT_Int)args[0]; + exc->GS.scan_type = (FT_Int)args[0] & 0xFFFFU; }