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

Caolán McNamara caolanm at redhat.com
Mon Nov 20 21:11:11 UTC 2017


 svx/source/customshapes/EnhancedCustomShape2d.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 78ecfa8aafea457d29e1c5f327b75e14ae0b70ce
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 20 14:42:31 2017 +0000

    ofz#4338 Integer-overflow
    
    Change-Id: I6019da51dced0ef560490b7e7cf303b8193f17ce
    Reviewed-on: https://gerrit.libreoffice.org/44971
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index e39e85e7fa05..51c11848de67 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -882,11 +882,11 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex )
                     fNumber = aResult.fValue = (*vNodesSharedPtr[ nIndex ])();
                     aResult.bReady = true;
 
-                    if ( !rtl::math::isFinite( fNumber ) )
-                        fNumber = 0.0;
                     SAL_INFO("svx", "equation " << nLevel << " (level: " << seqEquations[nIndex] << "): "
                              << fNumber << " --> " << 180.0*fNumber/10800000.0);
                 }
+                if ( !rtl::math::isFinite( fNumber ) )
+                    fNumber = 0.0;
             }
             catch ( ... )
             {


More information about the Libreoffice-commits mailing list