summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-01-10 21:33:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-01-11 09:50:52 +0100
commit3d14462e233571ac8a77ab0484069e6cc944f320 (patch)
treeb487a4df7181842b9cfaae94cfb067bae2d4c29c /filter
parent2281ade467e7dcc9652f74dbc4d9736100b0ad78 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/graphicfilter/itiff/itiff.cxx2
1 files changed, 1 insertions, 1 deletions
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;
}