From 13034e54aac631f5ca8b2dd27a64e5ac5c5f6fbc Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 26 Aug 2018 12:22:51 +0200 Subject: [PATCH] * 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 29ec53b6a..41caf8b74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-08-26 Werner Lemberg + + * 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 Minor tracing adjustments. diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c index 63fd4328e..1a365488f 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; }