summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libtiff/libtiff/tif_read.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_read.c')
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_read.c30
1 files changed, 12 insertions, 18 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_read.c b/src/3rdparty/libtiff/libtiff/tif_read.c
index a4c60b4..66f2e40 100644
--- a/src/3rdparty/libtiff/libtiff/tif_read.c
+++ b/src/3rdparty/libtiff/libtiff/tif_read.c
@@ -751,15 +751,12 @@ TIFFFillStrip(TIFF* tif, uint32_t strip)
(bytecount - 4096) / 10 > (uint64_t)stripsize )
{
uint64_t newbytecount = (uint64_t)stripsize * 10 + 4096;
- if( newbytecount == 0 || newbytecount > (uint64_t)TIFF_INT64_MAX )
- {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Too large strip byte count %"PRIu64", strip %"PRIu32". Limiting to %"PRIu64,
- bytecount,
- strip,
- newbytecount);
- bytecount = newbytecount;
- }
+ TIFFErrorExt(tif->tif_clientdata, module,
+ "Too large strip byte count %"PRIu64", strip %"PRIu32". Limiting to %"PRIu64,
+ bytecount,
+ strip,
+ newbytecount);
+ bytecount = newbytecount;
}
}
@@ -1145,15 +1142,12 @@ TIFFFillTile(TIFF* tif, uint32_t tile)
(bytecount - 4096) / 10 > (uint64_t)stripsize )
{
uint64_t newbytecount = (uint64_t)stripsize * 10 + 4096;
- if( newbytecount == 0 || newbytecount > (uint64_t)TIFF_INT64_MAX )
- {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Too large tile byte count %"PRIu64", tile %"PRIu32". Limiting to %"PRIu64,
- bytecount,
- tile,
- newbytecount);
- bytecount = newbytecount;
- }
+ TIFFErrorExt(tif->tif_clientdata, module,
+ "Too large tile byte count %"PRIu64", tile %"PRIu32". Limiting to %"PRIu64,
+ bytecount,
+ tile,
+ newbytecount);
+ bytecount = newbytecount;
}
}