diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-19 21:32:05 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-03 17:51:31 +0200 |
| commit | b72d93ff7e347d086f9bf228000c31123e4e97fb (patch) | |
| tree | cb9fabb308ad5f0d2f183ae2f192e2dd958e76bb /filter/source | |
| parent | 6b29ec0aae6d39aaf090d8ced33e650921b7552e (diff) | |
check np bounds again
Change-Id: I0fb61954b2eaf0c015d7bdefe9f03bd459b31501
(cherry picked from commit fcdddbd30a8b5cf6a5cc4d2ff28b7d4a20f8ec6b)
Reviewed-on: https://gerrit.libreoffice.org/17202
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'filter/source')
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index dc556f30b2b5..c35d94356a3d 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -652,6 +652,8 @@ bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent ) pTIFF->Seek(pStripOffsets[nStrip]); aLZWDecom.StartDecompression(*pTIFF); } + if (np >= SAL_N_ELEMENTS(pMap)) + return false; if ( ( aLZWDecom.Decompress( pMap[ np ], nBytesPerRow ) != nBytesPerRow ) || pTIFF->GetError() ) return false; MayCallback(nMinPercent+(nMaxPercent-nMinPercent)*(np*nImageLength+ny)/(nImageLength*nPlanes)); |