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

[Julien Nabet (via logerrit)]

 filter/source/msfilter/msdffimp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dfc4c3ed17bf8e4ad775b9092f235ec35e6c9072
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Jan 10 21:02:44 2021 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jan 11 07:42:40 2021 +0100

    loplugin:loopvartoosmall msdffimp (filter)
    
    Detected on Raspberry pi 4
    /home/pi/lo/libreoffice/filter/source/msfilter/msdffimp.cxx:5947:61: error: loop index type 'sal_uLong' (aka 'unsigned long') is narrower than length type 'sal_uInt64' (aka 'unsigned long long') [loplugin:loopvartoosmall]
        while( ( rStCtrl.GetError() == ERRCODE_NONE ) && ( nPos < nMaxStrPos ) && bOk );
                                                           ~~~~~^~~~~~~~~~~~
    
    Change-Id: Ic7649b4428d969d0f8814d2e00aa5af0dd781416
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109064
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index a69b7a31b615..404dd3aff6bc 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5909,7 +5909,7 @@ void SvxMSDffManager::GetCtrlData(sal_uInt32 nOffsDggL)
     sal_uInt32  nLength;
     if( !ReadCommonRecordHeader( rStCtrl, nVer, nInst, nFbt, nLength ) ) return;
 
-    sal_uLong nPos = nOffsDggL + DFF_COMMON_RECORD_HEADER_SIZE;
+    sal_uInt64 nPos = nOffsDggL + DFF_COMMON_RECORD_HEADER_SIZE;
 
     // case A: first Drawing Group Container, then n times Drawing Container
     if( DFF_msofbtDggContainer != nFbt )