summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--filter/source/graphicfilter/itiff/itiff.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 970e5958635f..15a4fe3d3b43 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -427,6 +427,10 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
case 0x0115: // Samples Per Pixel
nSamplesPerPixel = ReadIntData();
SAL_INFO("filter.tiff","SamplesPerPixel: " << nSamplesPerPixel);
+
+ if (nSamplesPerPixel > USHRT_MAX) // ofz#15993 the expected type is SHORT
+ bStatus = false;
+
break;
case 0x0116: // Rows Per Strip