[freetype2] master bec14f6: * src/psaux/psft.c (cf2_setGlyphWidth): Check format before setting.

[Hew Yih Shiuan Ewald]

branch: master
commit bec14f688925467be708f01378fbbf82e6b19b42
Author: Ewald Hew <address@hidden>
Commit: Ewald Hew <address@hidden>

    * src/psaux/psft.c (cf2_setGlyphWidth): Check format before setting.
    
    Reported as
    
      https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4377
---
 ChangeLog        | 8 ++++++++
 src/psaux/psft.c | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d5fc9c2..82d6f2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2017-11-22  Ewald Hew  <address@hidden>
 
+       * src/psaux/psft.c (cf2_setGlyphWidth): Check format before setting.
+
+       Reported as
+
+         https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4377
+
+2017-11-22  Ewald Hew  <address@hidden>
+
        [psaux] Fix CFF advance widths. (#52466)
 
        Glyph advance widths were being written to the new `PS_Decoder' but not
diff --git a/src/psaux/psft.c b/src/psaux/psft.c
index 0f9bdd9..bd5f831 100644
--- a/src/psaux/psft.c
+++ b/src/psaux/psft.c
@@ -95,7 +95,8 @@
 
     FT_ASSERT( decoder );
 
-    *decoder->glyph_width = cf2_fixedToInt( width );
+    if ( !decoder->builder.is_t1 )
+      *decoder->glyph_width = cf2_fixedToInt( width );
   }