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-06 12:56:33 +0200 |
| commit | 90949fa130cd6a31ae614a3fa3b38c8b13972d9b (patch) | |
| tree | bea68e9eecd8bd90d76e5fe3514cb235781267c2 /filter | |
| parent | e0b16213bfb2d3a22e7c431cd92899944165f3dc (diff) | |
check np bounds again
Change-Id: I0fb61954b2eaf0c015d7bdefe9f03bd459b31501
(cherry picked from commit fcdddbd30a8b5cf6a5cc4d2ff28b7d4a20f8ec6b)
Reviewed-on: https://gerrit.libreoffice.org/17201
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/qa/cppunit/data/tiff/fail/crash-3.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-3.tiff b/filter/qa/cppunit/data/tiff/fail/crash-3.tiff Binary files differnew file mode 100644 index 000000000000..4aa2393ade25 --- /dev/null +++ b/filter/qa/cppunit/data/tiff/fail/crash-3.tiff diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index aed15f629cda..834c437e7cc0 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -638,6 +638,8 @@ bool TIFFReader::ReadMap() 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; } |