[freetype2] master 785833d: * src/truetype/ttdriver.c (tt_size_request): Properly check `error'.

[Werner LEMBERG]

branch: master
commit 785833d96eacab4af67dc6be53571441df6d8a5b
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * src/truetype/ttdriver.c (tt_size_request): Properly check `error'.
    
    Reported by Earnestly <address@hidden> in
    
      http://lists.nongnu.org/archive/html/freetype/2017-04/msg00031.html
---
 ChangeLog                   | 8 ++++++++
 include/freetype/freetype.h | 4 ++++
 src/truetype/ttdriver.c     | 1 +
 3 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1aae6ad..f4d31fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-04-29  Werner Lemberg  <address@hidden>
+
+       * src/truetype/ttdriver.c (tt_size_request): Properly check `error'.
+
+       Reported by Earnestly <address@hidden> in
+
+         http://lists.nongnu.org/archive/html/freetype/2017-04/msg00031.html
+
 2017-04-27  Werner Lemberg  <address@hidden>
 
        Introduce AF_CONFIG_OPTION_TT_SIZE_METRICS configuration option.
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 2094382..681d8e9 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -2549,6 +2549,10 @@ FT_BEGIN_HEADER
   /*    glyph relative to this size.  For more information refer to        */
   /*    `https://www.freetype.org/freetype2/docs/glyphs/glyphs-2.html'.    */
   /*                                                                       */
+  /*    Contrary to @FT_Set_Char_Size, this function doesn't have special  */
+  /*    code to normalize zero-valued widths, heights, or resolutions      */
+  /*    (which lead to errors in most cases).                              */
+  /*                                                                       */
   /*    Don't use this function if you are using the FreeType cache API.   */
   /*                                                                       */
   FT_EXPORT( FT_Error )
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index c9f682e..a1653b2 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -360,6 +360,7 @@
 
 #ifdef TT_USE_BYTECODE_INTERPRETER
       /* for the `MPS' bytecode instruction we need the point size */
+      if ( !error )
       {
         FT_UInt  resolution =
                    ttsize->metrics->x_ppem > ttsize->metrics->y_ppem