[Libreoffice-commits] core.git: filter/source

[Caolán McNamara]

 filter/source/graphicfilter/ieps/ieps.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 334cc99139f59fffba214c821707c35270a6b0ee
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 26 10:50:39 2017 +0100

    ofz#3820 Integer-overflow
    
    Change-Id: I620b0278273e285100fe44d252389e6393a2022c
    Reviewed-on: https://gerrit.libreoffice.org/43877
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 27ccf4bac5db..65414afe6a82 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -97,10 +97,10 @@ static long ImplGetNumber(sal_uInt8* &rBuf, sal_uInt32& nSecurityCount)
                     nSecurityCount = 1;         // error parsing the bounding box values
                 else if ( bValid )
                 {
-                    const bool bFail = o3tl::checked_multiply(nRetValue, 10L, nRetValue);
+                    const bool bFail = o3tl::checked_multiply<long>(nRetValue, 10, nRetValue) ||
+                                       o3tl::checked_add<long>(nRetValue, *rBuf - '0', nRetValue);
                     if (bFail)
                         return 0;
-                    nRetValue += *rBuf - '0';
                 }
                 break;
         }