vcl/source/gdi/dibtools.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ddb78c7435444e74c4175156025c1dc596029afe
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue May 7 12:21:47 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed May 8 12:41:49 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.st...@cib.de>
(cherry picked from commit 34d1280271b74e1764bd4d1e34cb53b2b0c0dd62)
Reviewed-on: https://gerrit.libreoffice.org/71917
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
