summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-07-20 08:50:27 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-07-20 08:51:30 +0100
commitbca4d6f896fb12ceff37476c43ea8892898dd385 (patch)
treebd4c3e117006dfa0d5e56e1cd6c8623c0467daa9 /filter
parent5d32a4ac5c166264c2d44e8df625eb768eb42fbe (diff)
check np bounds yet again
Change-Id: Id3f6fdc0ebed9711acec5d71f404e7a6072b765c
Diffstat (limited to 'filter')
-rw-r--r--filter/qa/cppunit/data/tiff/fail/crash-5.tiffbin0 -> 252 bytes
-rw-r--r--filter/source/graphicfilter/itiff/itiff.cxx2
2 files changed, 2 insertions, 0 deletions
diff --git a/filter/qa/cppunit/data/tiff/fail/crash-5.tiff b/filter/qa/cppunit/data/tiff/fail/crash-5.tiff
new file mode 100644
index 000000000000..4849edff238b
--- /dev/null
+++ b/filter/qa/cppunit/data/tiff/fail/crash-5.tiff
Binary files differ
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index b18db6b9be3b..7a5d48793acd 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -669,6 +669,8 @@ bool TIFFReader::ReadMap()
pTIFF->Seek(pStripOffsets[nStrip]);
}
nRowBytesLeft = nBytesPerRow;
+ if (np >= SAL_N_ELEMENTS(pMap))
+ return false;
pdst=pMap[ np ];
do
{