[freetype2] master 13034e5: * src/pshint/pshalgo.c (psh_hint_overlap): Fix numeric overflow.

[Werner LEMBERG]

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

    * src/pshint/pshalgo.c (psh_hint_overlap): Fix numeric overflow.
    
    Reported as
    
      https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10057
---
 ChangeLog              | 8 ++++++++
 src/pshinter/pshalgo.c | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29ec53b..41caf8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2018-08-26  Werner Lemberg  <address@hidden>
 
+       * src/pshint/pshalgo.c (psh_hint_overlap): Fix numeric overflow.
+
+       Reported as
+
+         https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10057
+
+2018-08-26  Werner Lemberg  <address@hidden>
+
        Minor tracing adjustments.
 
        * src/base/ftstream.c (FT_Stream_EnterFrame, FT_Stream_ExitFrame):
diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c
index 63fd432..1a36548 100644
--- a/src/pshinter/pshalgo.c
+++ b/src/pshinter/pshalgo.c
@@ -53,8 +53,8 @@
   psh_hint_overlap( PSH_Hint  hint1,
                     PSH_Hint  hint2 )
   {
-    return hint1->org_pos + hint1->org_len >= hint2->org_pos &&
-           hint2->org_pos + hint2->org_len >= hint1->org_pos;
+    return ADD_INT( hint1->org_pos, hint1->org_len ) >= hint2->org_pos &&
+           ADD_INT( hint2->org_pos, hint2->org_len ) >= hint1->org_pos;
   }