diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-20 09:24:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-07-20 09:13:50 +0000 |
| commit | 4b96ee2d118c7d59408f361390158b7c8375cbf8 (patch) | |
| tree | ae98cd7429d5229f0c3685721d3b0af47f8b5cee /filter | |
| parent | 429f6b5183fa39751d949431e16bd6f4163bf78c (diff) | |
final check np bounds
Change-Id: I9213bb2cc059e05e286598edac03bd72c84db876
(cherry picked from commit dcbbe7741a08f6076f9e020f90cbb730c1edafb9)
Reviewed-on: https://gerrit.libreoffice.org/17212
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/qa/cppunit/data/tiff/fail/crash-6.tiff | bin | 0 -> 260 bytes | |||
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/filter/qa/cppunit/data/tiff/fail/crash-6.tiff b/filter/qa/cppunit/data/tiff/fail/crash-6.tiff Binary files differnew file mode 100644 index 000000000000..907b5101473e --- /dev/null +++ b/filter/qa/cppunit/data/tiff/fail/crash-6.tiff diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 7a5d48793acd..4fa050d18804 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -551,6 +551,8 @@ bool TIFFReader::ReadMap() if ( nStrip >= nNumStripOffsets ) return false; pTIFF->Seek( pStripOffsets[ nStrip ] + ( ny % GetRowsPerStrip() ) * nStripBytesPerRow ); + if (np >= SAL_N_ELEMENTS(pMap)) + return false; pTIFF->Read( pMap[ np ], nBytesPerRow ); if ( pTIFF->GetError() ) return false; |