[Libreoffice-commits] core.git: filter/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 11 08:51:15 UTC 2019
filter/source/graphicfilter/itiff/itiff.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3d14462e233571ac8a77ab0484069e6cc944f320
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jan 10 21:33:43 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jan 11 09:50:52 2019 +0100
ofz#11061 pick an upper bound on acceptible image size
Change-Id: I3386dfe5c53c07c60f8845380246fb369d970134
Reviewed-on: https://gerrit.libreoffice.org/66134
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index ec55044fd32c..8f8edd243be2 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1587,7 +1587,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
{
if (o3tl::checked_multiply<sal_Int32>(nImageWidth, nImageLength, nImageDataSize) ||
o3tl::checked_multiply<sal_Int32>(nImageDataSize, (HasAlphaChannel() ? 4 : 3), nImageDataSize) ||
- nImageDataSize > SAL_MAX_INT32/2)
+ nImageDataSize > SAL_MAX_INT32/4)
{
bStatus = false;
}
More information about the Libreoffice-commits
mailing list