archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

tiff_reader: only gaurd against over-allocation at read time

Browse Source
This commit is contained in:
Dane Springmeyer 2015-01-26 16:33:04 -08:00
parent 2a50372d25
commit 89118c2fcb
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tiff_reader.cpp
View File

@ -271,11 +271,6 @@ void tiff_reader<T>::init()
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &width_);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &height_);
if (width_ > 10000 || height_ > 10000)
{
throw image_reader_exception("Can't allocate tiff > 10000x10000");
}
TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &planar_config_);
TIFFGetField(tif, TIFFTAG_COMPRESSION, &compression_ );
TIFFGetField(tif, TIFFTAG_ROWSPERSTRIP, &rows_per_strip_);
@ -493,6 +488,10 @@ struct tiff_reader_traits<image_data_rgba8>
template <typename T>
image_data_any tiff_reader<T>::read(unsigned x0, unsigned y0, unsigned width, unsigned height)
{
if (width > 10000 || height > 10000)
{
throw image_reader_exception("Can't allocate tiff > 10000x10000");
}
switch (photometric_)
{
case PHOTOMETRIC_MINISBLACK: