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

[Caolán McNamara]

 emfio/source/reader/wmfreader.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2352a8e8e3fee49fbcea1118c5a41cbf4b3998ce
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 10 09:08:48 2017 +0000

    ofz#4158 Integer-overflow
    
    Change-Id: I117156abf0e1f52491bf6bbe42bf18f4efd364f7
    Reviewed-on: https://gerrit.libreoffice.org/44579
    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/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 2cb5eeb3f6de..1d0ee83709fc 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -526,7 +526,8 @@ namespace emfio
             case W_META_EXTTEXTOUT:
             {
                 mpInputStream->SeekRel(-6);
-                sal_Int32 nRecordPos = mpInputStream->Tell(), nRecordSize = 0;
+                auto nRecordPos = mpInputStream->Tell();
+                sal_Int32 nRecordSize = 0;
                 mpInputStream->ReadInt32( nRecordSize );
                 mpInputStream->SeekRel(2);
                 Point aPosition = ReadYX();
@@ -567,9 +568,9 @@ namespace emfio
                     if ( nNewTextLen )
                     {
                         std::unique_ptr<long[]> pDXAry, pDYAry;
-                        sal_uInt32  nMaxStreamPos = nRecordPos + ( nRecordSize << 1 );
-                        sal_Int32   nDxArySize =  nMaxStreamPos - mpInputStream->Tell();
-                        sal_Int32   nDxAryEntries = nDxArySize >> 1;
+                        auto nMaxStreamPos = nRecordPos + ( nRecordSize << 1 );
+                        auto nDxArySize =  nMaxStreamPos - mpInputStream->Tell();
+                        auto nDxAryEntries = nDxArySize >> 1;
                         bool        bUseDXAry = false;
 
                         if ( ( ( nDxAryEntries % nOriginalTextLen ) == 0 ) && ( nNewTextLen <= nOriginalTextLen ) )