[freetype2] master ddf3872: [truetype] Fix commit from 2014-11-24.

[Werner LEMBERG]

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

    [truetype] Fix commit from 2014-11-24.
    
    Problem reported by Hin-Tak Leung  <address@hidden>.
    
    * src/truetype/ttpload.c (tt_face_load_hdmx): Fix file checking
    logic.
---
 ChangeLog              |    9 +++++++++
 src/truetype/ttpload.c |    9 +++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 54bc4e1..da074a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-10-27  Werner Lemberg  <address@hidden>
+
+       [truetype] Fix commit from 2014-11-24.
+
+       Problem reported by Hin-Tak Leung  <address@hidden>.
+
+       * src/truetype/ttpload.c (tt_face_load_hdmx): Fix file checking
+       logic.
+
 2016-10-26  Werner Lemberg  <address@hidden>
 
        Add `FT_Get_{MM,Var}_Blend_Coordinates' functions.
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c
index c84c18e..cd1d27c 100644
--- a/src/truetype/ttpload.c
+++ b/src/truetype/ttpload.c
@@ -563,10 +563,11 @@
       record_size &= 0xFFFFU;
 
     /* The limit for `num_records' is a heuristic value. */
-    if ( version != 0           ||
-         num_records > 255      ||
-         record_size > 0x10001L ||
-         record_size < 4        )
+    if ( version != 0                   ||
+         num_records > 255              ||
+         ( num_records > 0            &&
+           ( record_size > 0x10001L ||
+             record_size < 4        ) ) )
     {
       error = FT_THROW( Invalid_File_Format );
       goto Fail;