[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-4' - vcl/source

[Michael Stahl (via logerrit)]

 vcl/source/gdi/dibtools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 62d1222fde5adff3949e4ea5a593f3aff6fe8631
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue May 7 12:21:47 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 8 14:07:58 2019 +0200

    tdf#125153 vcl: fix ImplReadDIBFileHeader()
    
    Apparently the offset needs to be checked against the total size
    of the stream, not against the remaining size.
    
    (regression from b67d9a5db61de3cef2dac072c55bf1dac9a2dc4c)
    
    Change-Id: I7e714b7c4ce34b5285cfbf9ca81133ecbbb16fc1
    Reviewed-on: https://gerrit.libreoffice.org/71903
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 34d1280271b74e1764bd4d1e34cb53b2b0c0dd62)
    Reviewed-on: https://gerrit.libreoffice.org/71917
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit ddb78c7435444e74c4175156025c1dc596029afe)
    Reviewed-on: https://gerrit.libreoffice.org/71954
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index b06e05527499..5def32b90b0d 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1053,7 +1053,7 @@ bool ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset )
 {
     bool bRet = false;
 
-    const sal_uInt64 nStreamLength = rIStm.remainingSize();
+    const sal_uInt64 nStreamLength = rIStm.TellEnd();
 
     sal_uInt16 nTmp16 = 0;
     rIStm.ReadUInt16( nTmp16 );