ofz: don't read data that isn't there

Change-Id: I7fdcb78bde8f650c1a57d34177d8993a6d8a0a2f
2017-02-23 11:05:40 +00:00 · 2017-02-23 11:05:40 +00:00 · ee619fb344
commit ee619fb344
parent 46b1b5dd2a
1 changed files with 6 additions and 0 deletions
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@ -995,6 +995,12 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
                {
                    sal_uInt32 nByteCount = nImageWidth >> 3;

+                    sal_uInt32 nBytesNeeded = nByteCount;
+                    if (nImageWidth & 7)
+                        ++nBytesNeeded;
+                    if (pt + nBytesNeeded > ptend)
+                        return false;
+
                    if ( bByteSwap )
                    {
                        sal_Int32 nx = 0;