freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 5081674: [truetype] Fix SCANTYPE instruction (#49394)


From: Werner LEMBERG
Subject: [freetype2] master 5081674: [truetype] Fix SCANTYPE instruction (#49394).
Date: Sat, 22 Oct 2016 17:16:24 +0000 (UTC)

branch: master
commit 5081674c5f3c2c7bcf49bc48f8618dd091325c9d
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [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 3b12c20..b1239f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-10-22  Werner Lemberg  <address@hidden>
 
+       [truetype] Fix SCANTYPE instruction (#49394).
+
+       * src/truetype/ttinterp.c (Ins_SCANTYPE): Only use lower 16bits.
+
+2016-10-22  Werner Lemberg  <address@hidden>
+
        [sfnt] Improve handling of invalid post 2.5 tables [#49393].
 
        * src/sfnt/ttpost.c (load_format_25): We need at least a single
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 2bd3fbc..230b130 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;
   }
 
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]