diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-23 11:05:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-23 11:07:02 +0000 |
| commit | ee619fb344c7e8f491e09bd256df7f8567af9bef (patch) | |
| tree | d83064e53798a0cd98418b6dcf1fceab8d628d0c /filter | |
| parent | 46b1b5dd2a5368663fd56434160fa126f1a54d84 (diff) | |
ofz: don't read data that isn't there
Change-Id: I7fdcb78bde8f650c1a57d34177d8993a6d8a0a2f
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 12aee89023e5..807756a561bd 100644 --- 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; |