<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3d69138098e8ecfa20c90f459fe00604ee37869f">https://github.com/macports/macports-ports/commit/3d69138098e8ecfa20c90f459fe00604ee37869f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3d69138098e tiff: add all CVE patches from Debian's tiff 4.4.0 package.
</span>3d69138098e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3d69138098e8ecfa20c90f459fe00604ee37869f
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Sat Dec 3 12:11:15 2022 -0800
<span style='display:block; white-space:pre;color:#404040;'> tiff: add all CVE patches from Debian's tiff 4.4.0 package.
</span>---
graphics/tiff/Portfile | 13 +-
...CVE-2022-2056_CVE-2022-2057_CVE-2022-2058.patch | 180 ++++++
...22-2520_CVE-2022-2521_CVE-2022-2953_part1.patch | 73 +++
...22-2520_CVE-2022-2521_CVE-2022-2953_part2.patch | 33 ++
graphics/tiff/files/CVE-2022-34526.patch | 28 +
graphics/tiff/files/CVE-2022-3570.patch | 655 +++++++++++++++++++++
...CVE-2022-3597_CVE-2022-3626_CVE-2022-3627.patch | 101 ++++
graphics/tiff/files/CVE-2022-3598.patch | 38 ++
graphics/tiff/files/CVE-2022-3599.patch | 262 +++++++++
9 files changed, 1382 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tiff/Portfile b/graphics/tiff/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b6b2daacd67..24c59d46117 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/tiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup muniversal 1.0
</span>
name tiff
version 4.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 715752ebd2613d2e454b90d25f0c003bd8626ea4 \
sha256 917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed \
size 2841082
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,8 +45,19 @@ test.target check
</span>
compiler.c_standard 1999
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# CVE patches taken from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# http://ftp.debian.org/debian/pool/main/t/tiff/tiff_4.4.0-6.debian.tar.xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and applied in the same order.
</span> patchfiles allow-opengl-without-x11.patch \
dont-find-x11-opengl.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2022-2056_CVE-2022-2057_CVE-2022-2058.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2022-34526.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2022-3597_CVE-2022-3626_CVE-2022-3627.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2022-3570.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2022-3599.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2022-3598.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2022-2519_CVE-2022-2520_CVE-2022-2521_CVE-2022-2953_part1.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2022-2519_CVE-2022-2520_CVE-2022-2521_CVE-2022-2953_part2.patch \
</span> CVE-2022-3970.patch
configure.args --disable-jbig \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tiff/files/CVE-2022-2056_CVE-2022-2057_CVE-2022-2058.patch b/graphics/tiff/files/CVE-2022-2056_CVE-2022-2057_CVE-2022-2058.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3514898d9c2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tiff/files/CVE-2022-2056_CVE-2022-2057_CVE-2022-2058.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,180 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From dd1bcc7abb26094e93636e85520f0d8f81ab0fab Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: 4ugustus <wangdw.augustus@qq.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 11 Jun 2022 09:31:43 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] fix the FPE in tiffcrop (#415, #427, and #428)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libtiff/tif_aux.c | 9 +++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libtiff/tiffiop.h | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/tiffcrop.c | 62 ++++++++++++++++++++++++++---------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 44 insertions(+), 28 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 140f26c7..5b88c8d0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtiff/tif_aux.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtiff/tif_aux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -402,6 +402,15 @@ float _TIFFClampDoubleToFloat( double val )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (float)val;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++uint32_t _TIFFClampDoubleToUInt32(double val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( val < 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( val > 0xFFFFFFFFU || val != val )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0xFFFFFFFFU;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (uint32_t)val;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int _TIFFSeekOK(TIFF* tif, toff_t off)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Huge offsets, especially -1 / UINT64_MAX, can cause issues */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e3af461d..4e8bdac2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtiff/tiffiop.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtiff/tiffiop.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -365,6 +365,7 @@ extern double _TIFFUInt64ToDouble(uint64_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern float _TIFFUInt64ToFloat(uint64_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern float _TIFFClampDoubleToFloat(double);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern uint32_t _TIFFClampDoubleToUInt32(double);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern tmsize_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _TIFFReadEncodedStripAndAllocBuffer(TIFF* tif, uint32_t strip,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1f827b2b..90286a5e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/tiffcrop.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5268,17 +5268,17 @@ computeInputPixelOffsets(struct crop_mask *crop, struct image_data *image,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((crop->res_unit == RESUNIT_INCH) || (crop->res_unit == RESUNIT_CENTIMETER))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x1 = (uint32_t) (crop->corners[i].X1 * scale * xres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x2 = (uint32_t) (crop->corners[i].X2 * scale * xres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y1 = (uint32_t) (crop->corners[i].Y1 * scale * yres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y2 = (uint32_t) (crop->corners[i].Y2 * scale * yres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x1 = _TIFFClampDoubleToUInt32(crop->corners[i].X1 * scale * xres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x2 = _TIFFClampDoubleToUInt32(crop->corners[i].X2 * scale * xres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y1 = _TIFFClampDoubleToUInt32(crop->corners[i].Y1 * scale * yres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y2 = _TIFFClampDoubleToUInt32(crop->corners[i].Y2 * scale * yres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x1 = (uint32_t) (crop->corners[i].X1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x2 = (uint32_t) (crop->corners[i].X2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y1 = (uint32_t) (crop->corners[i].Y1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y2 = (uint32_t) (crop->corners[i].Y2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x1 = _TIFFClampDoubleToUInt32(crop->corners[i].X1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x2 = _TIFFClampDoubleToUInt32(crop->corners[i].X2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y1 = _TIFFClampDoubleToUInt32(crop->corners[i].Y1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y2 = _TIFFClampDoubleToUInt32(crop->corners[i].Y2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* a) Region needs to be within image sizes 0.. width-1; 0..length-1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * b) Corners are expected to be submitted as top-left to bottom-right.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5357,17 +5357,17 @@ computeInputPixelOffsets(struct crop_mask *crop, struct image_data *image,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (crop->res_unit != RESUNIT_INCH && crop->res_unit != RESUNIT_CENTIMETER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { /* User has specified pixels as reference unit */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmargin = (uint32_t)(crop->margins[0]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lmargin = (uint32_t)(crop->margins[1]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bmargin = (uint32_t)(crop->margins[2]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rmargin = (uint32_t)(crop->margins[3]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmargin = _TIFFClampDoubleToUInt32(crop->margins[0]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lmargin = _TIFFClampDoubleToUInt32(crop->margins[1]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bmargin = _TIFFClampDoubleToUInt32(crop->margins[2]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rmargin = _TIFFClampDoubleToUInt32(crop->margins[3]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { /* inches or centimeters specified */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmargin = (uint32_t)(crop->margins[0] * scale * yres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lmargin = (uint32_t)(crop->margins[1] * scale * xres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bmargin = (uint32_t)(crop->margins[2] * scale * yres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rmargin = (uint32_t)(crop->margins[3] * scale * xres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmargin = _TIFFClampDoubleToUInt32(crop->margins[0] * scale * yres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lmargin = _TIFFClampDoubleToUInt32(crop->margins[1] * scale * xres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bmargin = _TIFFClampDoubleToUInt32(crop->margins[2] * scale * yres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rmargin = _TIFFClampDoubleToUInt32(crop->margins[3] * scale * xres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((lmargin + rmargin) > image->width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5397,24 +5397,24 @@ computeInputPixelOffsets(struct crop_mask *crop, struct image_data *image,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (crop->res_unit != RESUNIT_INCH && crop->res_unit != RESUNIT_CENTIMETER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (crop->crop_mode & CROP_WIDTH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- width = (uint32_t)crop->width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ width = _TIFFClampDoubleToUInt32(crop->width);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ width = image->width - lmargin - rmargin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (crop->crop_mode & CROP_LENGTH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- length = (uint32_t)crop->length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ length = _TIFFClampDoubleToUInt32(crop->length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ length = image->length - tmargin - bmargin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (crop->crop_mode & CROP_WIDTH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- width = (uint32_t)(crop->width * scale * image->xres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ width = _TIFFClampDoubleToUInt32(crop->width * scale * image->xres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ width = image->width - lmargin - rmargin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (crop->crop_mode & CROP_LENGTH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- length = (uint32_t)(crop->length * scale * image->yres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ length = _TIFFClampDoubleToUInt32(crop->length * scale * image->yres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ length = image->length - tmargin - bmargin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5868,13 +5868,13 @@ computeOutputPixelOffsets (struct crop_mask *crop, struct image_data *image,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (page->res_unit == RESUNIT_INCH || page->res_unit == RESUNIT_CENTIMETER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { /* inches or centimeters specified */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hmargin = (uint32_t)(page->hmargin * scale * page->hres * ((image->bps + 7) / 8));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vmargin = (uint32_t)(page->vmargin * scale * page->vres * ((image->bps + 7) / 8));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hmargin = _TIFFClampDoubleToUInt32(page->hmargin * scale * page->hres * ((image->bps + 7) / 8));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vmargin = _TIFFClampDoubleToUInt32(page->vmargin * scale * page->vres * ((image->bps + 7) / 8));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { /* Otherwise user has specified pixels as reference unit */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hmargin = (uint32_t)(page->hmargin * scale * ((image->bps + 7) / 8));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vmargin = (uint32_t)(page->vmargin * scale * ((image->bps + 7) / 8));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hmargin = _TIFFClampDoubleToUInt32(page->hmargin * scale * ((image->bps + 7) / 8));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vmargin = _TIFFClampDoubleToUInt32(page->vmargin * scale * ((image->bps + 7) / 8));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((hmargin * 2.0) > (pwidth * page->hres))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5912,13 +5912,13 @@ computeOutputPixelOffsets (struct crop_mask *crop, struct image_data *image,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (page->mode & PAGE_MODE_PAPERSIZE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- owidth = (uint32_t)((pwidth * page->hres) - (hmargin * 2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- olength = (uint32_t)((plength * page->vres) - (vmargin * 2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ owidth = _TIFFClampDoubleToUInt32((pwidth * page->hres) - (hmargin * 2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ olength = _TIFFClampDoubleToUInt32((plength * page->vres) - (vmargin * 2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- owidth = (uint32_t)(iwidth - (hmargin * 2 * page->hres));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- olength = (uint32_t)(ilength - (vmargin * 2 * page->vres));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ owidth = _TIFFClampDoubleToUInt32(iwidth - (hmargin * 2 * page->hres));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ olength = _TIFFClampDoubleToUInt32(ilength - (vmargin * 2 * page->vres));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5927,6 +5927,12 @@ computeOutputPixelOffsets (struct crop_mask *crop, struct image_data *image,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (olength > ilength)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ olength = ilength;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (owidth == 0 || olength == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFError("computeOutputPixelOffsets", "Integer overflow when calculating the number of pages");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Compute the number of pages required for Portrait or Landscape */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (page->orient)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tiff/files/CVE-2022-2519_CVE-2022-2520_CVE-2022-2521_CVE-2022-2953_part1.patch b/graphics/tiff/files/CVE-2022-2519_CVE-2022-2520_CVE-2022-2521_CVE-2022-2953_part1.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..38de4960600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tiff/files/CVE-2022-2519_CVE-2022-2520_CVE-2022-2521_CVE-2022-2953_part1.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,73 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8fe3735942ea1d90d8cef843b55b3efe8ab6feaf Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Su_Laus <sulau@freenet.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 15 Aug 2022 22:11:03 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] =?UTF-8?q?According=20to=20Richard=20Nolde=20https://gitl?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?ab.com/libtiff/libtiff/-/issues/401#note=5F877637400=20the=20ti?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?ffcrop=20option=20=E2=80=9E-S=E2=80=9C=20is=20also=20mutually?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?=20exclusive=20to=20the=20other=20crop=20options=20(-X|-Y),=20-?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?Z=20and=20-z.?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is now checked and ends tiffcrop if those arguments are not mutually exclusive.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This MR will fix the following tiffcrop issues: #349, #414, #422, #423, #424
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/tiffcrop.c | 31 ++++++++++++++++---------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 16 insertions(+), 15 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 90286a5e..c3b758ec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/tiffcrop.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,12 +175,12 @@ static char tiffcrop_rev_date[] = "02-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ROTATECW_270 32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ROTATE_ANY (ROTATECW_90 | ROTATECW_180 | ROTATECW_270)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define CROP_NONE 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define CROP_MARGINS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define CROP_WIDTH 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define CROP_LENGTH 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define CROP_ZONES 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define CROP_REGIONS 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CROP_NONE 0 /* "-S" -> Page_MODE_ROWSCOLS and page->rows/->cols != 0 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CROP_MARGINS 1 /* "-m" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CROP_WIDTH 2 /* "-X" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CROP_LENGTH 4 /* "-Y" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CROP_ZONES 8 /* "-Z" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CROP_REGIONS 16 /* "-z" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CROP_ROTATE 32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CROP_MIRROR 64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CROP_INVERT 128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -322,7 +322,7 @@ struct crop_mask {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PAGE_MODE_RESOLUTION 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PAGE_MODE_PAPERSIZE 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PAGE_MODE_MARGINS 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define PAGE_MODE_ROWSCOLS 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define PAGE_MODE_ROWSCOLS 8 /* for -S option */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INVERT_DATA_ONLY 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INVERT_DATA_AND_TAG 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2155,13 +2155,14 @@ void process_command_opts (int argc, ch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*NOTREACHED*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*-- Check for not allowed combinations (e.g. -X, -Y and -Z and -z are mutually exclusive) --*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char XY, Z, R;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z and -S are mutually exclusive) --*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char XY, Z, R, S;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Z = (crop_data->crop_mode & CROP_ZONES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ R = (crop_data->crop_mode & CROP_REGIONS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((XY && Z) || (XY && R) || (Z && R)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->exit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ S = (page->mode & PAGE_MODE_ROWSCOLS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) || (R && S)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->Exit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tiff/files/CVE-2022-2519_CVE-2022-2520_CVE-2022-2521_CVE-2022-2953_part2.patch b/graphics/tiff/files/CVE-2022-2519_CVE-2022-2520_CVE-2022-2521_CVE-2022-2953_part2.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..296dc42b91c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tiff/files/CVE-2022-2519_CVE-2022-2520_CVE-2022-2521_CVE-2022-2953_part2.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From bad48e90b410df32172006c7876da449ba62cdba Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Su_Laus <sulau@freenet.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 20 Aug 2022 23:35:26 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] tiffcrop -S option: Make decision simpler.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/tiffcrop.c | 10 +++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c3b758ec..8fd856dc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/tiffcrop.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2157,11 +2157,11 @@ void process_command_opts (int argc, char *argv[], char *mp, char *mode, uint32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z and -S are mutually exclusive) --*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char XY, Z, R, S;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Z = (crop_data->crop_mode & CROP_ZONES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- R = (crop_data->crop_mode & CROP_REGIONS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- S = (page->mode & PAGE_MODE_ROWSCOLS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) || (R && S)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Z = (crop_data->crop_mode & CROP_ZONES) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ R = (crop_data->crop_mode & CROP_REGIONS) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ S = (page->mode & PAGE_MODE_ROWSCOLS) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (XY + Z + R + S > 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->Exit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tiff/files/CVE-2022-34526.patch b/graphics/tiff/files/CVE-2022-34526.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d21fa3416ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tiff/files/CVE-2022-34526.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 275735d0354e39c0ac1dc3c0db2120d6f31d1990 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Even Rouault <even.rouault@spatialys.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 27 Jun 2022 16:09:43 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] _TIFFCheckFieldIsValidForCodec(): return FALSE when passed a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ codec-specific tag and the codec is not configured (fixes #433)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This avoids crashes when querying such tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libtiff/tif_dirinfo.c | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c30f569b..3371cb5c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtiff/tif_dirinfo.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtiff/tif_dirinfo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1191,6 +1191,9 @@ _TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( !TIFFIsCODECConfigured(tif->tif_dir.td_compression) ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Check if codec specific tags are allowed for the current
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * compression scheme (codec) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (tif->tif_dir.td_compression) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tiff/files/CVE-2022-3570.patch b/graphics/tiff/files/CVE-2022-3570.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d940c676a50
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tiff/files/CVE-2022-3570.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,655 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From bd94a9b383d8755a27b5a1bc27660b8ad10b094c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Su_Laus <sulau@freenet.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 22 Aug 2022 09:35:48 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] tiffcrop subroutines require a larger buffer (fixes #271,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #381, #386, #388, #389, #435)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Buffer overflows have been fixed by making the buffers at least 3 bytes larger than the image itself needs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is required for some tiffcrop conversion subroutines.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In addition, some integer casting warnings have been fixed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Closes issues #271, #381, #386, #388, #389 and #435.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/tiffcrop.c | 211 ++++++++++++++++++++++++++---------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 119 insertions(+), 92 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8fd856dc..39ce639d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/tiffcrop.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -212,6 +212,10 @@ static char tiffcrop_rev_date[] = "15-08-2022";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TIFF_DIR_MAX 65534
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Some conversion subroutines require image buffers, which are at least 3 bytes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * larger than the necessary size for the image itself. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define NUM_BUFF_OVERSIZE_BYTES 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Offsets into buffer for margins and fixed width and length segments */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct offset {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t tmargin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -233,7 +237,7 @@ struct offset {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct buffinfo {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t size; /* size of this buffer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint64_t size; /* size of this buffer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char *buffer; /* address of the allocated buffer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -810,8 +814,8 @@ static int readContigTilesIntoBuffer (TIFF* in, uint8_t* buf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t dst_rowsize, shift_width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t bytes_per_sample, bytes_per_pixel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t trailing_bits, prev_trailing_bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t tile_rowsize = TIFFTileRowSize(in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t src_offset, dst_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmsize_t tile_rowsize = TIFFTileRowSize(in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmsize_t src_offset, dst_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t row_offset, col_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t *bufp = (uint8_t*) buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char *src = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -861,7 +865,7 @@ static int readContigTilesIntoBuffer (TIFF* in, uint8_t* buf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError("readContigTilesIntoBuffer", "Integer overflow when calculating buffer size.");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tilebuf = limitMalloc(tile_buffsize + 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tilebuf = limitMalloc(tile_buffsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tilebuf == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tilebuf[tile_buffsize] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1024,7 +1028,7 @@ static int readSeparateTilesIntoBuffer (TIFF* in, uint8_t *obuf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (sample = 0; (sample < spp) && (sample < MAX_SAMPLES); sample++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ srcbuffs[sample] = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tbuff = (unsigned char *)limitMalloc(tilesize + 8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tbuff = (unsigned char *)limitMalloc(tilesize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!tbuff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError ("readSeparateTilesIntoBuffer",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1217,7 +1221,8 @@ writeBufferToSeparateStrips (TIFF* out, uint8_t* buf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rowstripsize = rowsperstrip * bytes_per_sample * (width + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- obuf = limitMalloc (rowstripsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Add 3 padding bytes for extractContigSamples32bits */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ obuf = limitMalloc (rowstripsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (obuf == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1229,7 +1234,7 @@ writeBufferToSeparateStrips (TIFF* out, uint8_t* buf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stripsize = TIFFVStripSize(out, nrows);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src = buf + (row * rowsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memset (obuf, '\0', rowstripsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset (obuf, '\0',rowstripsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (extractContigSamplesToBuffer(obuf, src, nrows, width, s, spp, bps, dump))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _TIFFfree(obuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1237,10 +1242,15 @@ writeBufferToSeparateStrips (TIFF* out, uint8_t* buf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((dump->outfile != NULL) && (dump->level == 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dump_info(dump->outfile, dump->format,"",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (scanlinesize > 0x0ffffffffULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_info(dump->infile, dump->format, "loadImage",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Attention: scanlinesize %"PRIu64" is larger than UINT32_MAX.\nFollowing dump might be wrong.",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanlinesize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_info(dump->outfile, dump->format,"",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Sample %2d, Strip: %2d, bytes: %4d, Row %4d, bytes: %4d, Input offset: %6d",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- s + 1, strip + 1, stripsize, row + 1, scanlinesize, src - buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dump_buffer(dump->outfile, dump->format, nrows, scanlinesize, row, obuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s + 1, strip + 1, stripsize, row + 1, (uint32_t)scanlinesize, src - buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_buffer(dump->outfile, dump->format, nrows, (uint32_t)scanlinesize, row, obuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (TIFFWriteEncodedStrip(out, strip++, obuf, stripsize) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1267,7 +1277,7 @@ static int writeBufferToContigTiles (TIFF* out, uint8_t* buf, uint32_t imageleng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t tl, tw;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t row, col, nrow, ncol;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t src_rowsize, col_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t tile_rowsize = TIFFTileRowSize(out);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmsize_t tile_rowsize = TIFFTileRowSize(out);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t* bufp = (uint8_t*) buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tsize_t tile_buffsize = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tsize_t tilesize = TIFFTileSize(out);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1310,9 +1320,11 @@ static int writeBufferToContigTiles (TIFF* out, uint8_t* buf, uint32_t imageleng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src_rowsize = ((imagewidth * spp * bps) + 7U) / 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tilebuf = limitMalloc(tile_buffsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Add 3 padding bytes for extractContigSamples32bits */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tilebuf = limitMalloc(tile_buffsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tilebuf == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset(tilebuf, 0, tile_buffsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (row = 0; row < imagelength; row += tl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nrow = (row + tl > imagelength) ? imagelength - row : tl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1358,7 +1370,8 @@ static int writeBufferToSeparateTiles (TIFF* out, uint8_t* buf, uint32_t imagele
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t imagewidth, tsample_t spp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct dump_opts * dump)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tdata_t obuf = limitMalloc(TIFFTileSize(out));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Add 3 padding bytes for extractContigSamples32bits */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tdata_t obuf = limitMalloc(TIFFTileSize(out) + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t tl, tw;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t row, col, nrow, ncol;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t src_rowsize, col_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1368,6 +1381,7 @@ static int writeBufferToSeparateTiles (TIFF* out, uint8_t* buf, uint32_t imagele
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (obuf == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset(obuf, 0, TIFFTileSize(out) + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !TIFFGetField(out, TIFFTAG_TILELENGTH, &tl) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !TIFFGetField(out, TIFFTAG_TILEWIDTH, &tw) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1793,14 +1807,14 @@ void process_command_opts (int argc, char *argv[], char *mp, char *mode, uint32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *opt_offset = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* convert option to lowercase */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- end = strlen (opt_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end = (unsigned int)strlen (opt_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < end; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *(opt_ptr + i) = tolower((int) *(opt_ptr + i));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Look for dump format specification */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (strncmp(opt_ptr, "for", 3) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* convert value to lowercase */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- end = strlen (opt_offset + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end = (unsigned int)strlen (opt_offset + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 1; i <= end; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *(opt_offset + i) = tolower((int) *(opt_offset + i));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* check dump format value */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2272,6 +2286,8 @@ main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char temp_filename[PATH_MAX + 16]; /* Extra space keeps the compiler from complaining */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert(NUM_BUFF_OVERSIZE_BYTES >= 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ little_endian = *((unsigned char *)&little_endian) & '1';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ initImageData(&image);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3226,13 +3242,13 @@ extractContigSamples32bits (uint8_t *in, uint8_t *out, uint32_t cols,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* If we have a full buffer's worth, write it out */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ready_bits >= 32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff1 = (buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff1 = (uint8_t)(buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff2 = (buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff2 = (uint8_t)(buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff3 = (buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff3 = (uint8_t)(buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff4 = (buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff4 = (uint8_t)(buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ready_bits -= 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3641,13 +3657,13 @@ extractContigSamplesShifted32bits (uint8_t *in, uint8_t *out, uint32_t cols,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else /* If we have a full buffer's worth, write it out */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff1 = (buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff1 = (uint8_t)(buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff2 = (buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff2 = (uint8_t)(buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff3 = (buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff3 = (uint8_t)(buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff4 = (buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff4 = (uint8_t)(buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ready_bits -= 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3824,10 +3840,10 @@ extractContigSamplesToTileBuffer(uint8_t *out, uint8_t *in, uint32_t rows, uint3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int readContigStripsIntoBuffer (TIFF* in, uint8_t* buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t* bufp = buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int32_t bytes_read = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmsize_t bytes_read = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t strip, nstrips = TIFFNumberOfStrips(in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t stripsize = TIFFStripSize(in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t rows = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmsize_t stripsize = TIFFStripSize(in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmsize_t rows = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t rps = TIFFGetFieldDefaulted(in, TIFFTAG_ROWSPERSTRIP, &rps);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tsize_t scanline_size = TIFFScanlineSize(in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3840,11 +3856,11 @@ static int readContigStripsIntoBuffer (TIFF* in, uint8_t* buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytes_read = TIFFReadEncodedStrip (in, strip, bufp, -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rows = bytes_read / scanline_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((strip < (nstrips - 1)) && (bytes_read != (int32_t)stripsize))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TIFFError("", "Strip %"PRIu32": read %"PRId32" bytes, strip size %"PRIu32,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFError("", "Strip %"PRIu32": read %"PRId64" bytes, strip size %"PRIu64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strip + 1, bytes_read, stripsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (bytes_read < 0 && !ignore) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TIFFError("", "Error reading strip %"PRIu32" after %"PRIu32" rows",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFError("", "Error reading strip %"PRIu32" after %"PRIu64" rows",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strip, rows);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4309,13 +4325,13 @@ combineSeparateSamples32bits (uint8_t *in[], uint8_t *out, uint32_t cols,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* If we have a full buffer's worth, write it out */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ready_bits >= 32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff1 = (buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff1 = (uint8_t)(buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff2 = (buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff2 = (uint8_t)(buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff3 = (buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff3 = (uint8_t)(buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff4 = (buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff4 = (uint8_t)(buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ready_bits -= 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4358,10 +4374,10 @@ combineSeparateSamples32bits (uint8_t *in[], uint8_t *out, uint32_t cols,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Row %3d, Col %3d, Src byte offset %3d bit offset %2d Dst offset %3d",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ row + 1, col + 1, src_byte, src_bit, dst - out);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dump_long (dumpfile, format, "Match bits ", matchbits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_wide (dumpfile, format, "Match bits ", matchbits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_data (dumpfile, format, "Src bits ", src, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dump_long (dumpfile, format, "Buff1 bits ", buff1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dump_long (dumpfile, format, "Buff2 bits ", buff2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_wide (dumpfile, format, "Buff1 bits ", buff1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_wide (dumpfile, format, "Buff2 bits ", buff2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_byte (dumpfile, format, "Write bits1", bytebuff1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_byte (dumpfile, format, "Write bits2", bytebuff2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_info (dumpfile, format, "", "Ready bits: %2d", ready_bits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4834,13 +4850,13 @@ combineSeparateTileSamples32bits (uint8_t *in[], uint8_t *out, uint32_t cols,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* If we have a full buffer's worth, write it out */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ready_bits >= 32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff1 = (buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff1 = (uint8_t)(buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff2 = (buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff2 = (uint8_t)(buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff3 = (buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff3 = (uint8_t)(buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff4 = (buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff4 = (uint8_t)(buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ready_bits -= 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4883,10 +4899,10 @@ combineSeparateTileSamples32bits (uint8_t *in[], uint8_t *out, uint32_t cols,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Row %3d, Col %3d, Src byte offset %3d bit offset %2d Dst offset %3d",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ row + 1, col + 1, src_byte, src_bit, dst - out);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dump_long (dumpfile, format, "Match bits ", matchbits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_wide (dumpfile, format, "Match bits ", matchbits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_data (dumpfile, format, "Src bits ", src, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dump_long (dumpfile, format, "Buff1 bits ", buff1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dump_long (dumpfile, format, "Buff2 bits ", buff2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_wide (dumpfile, format, "Buff1 bits ", buff1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_wide (dumpfile, format, "Buff2 bits ", buff2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_byte (dumpfile, format, "Write bits1", bytebuff1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_byte (dumpfile, format, "Write bits2", bytebuff2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_info (dumpfile, format, "", "Ready bits: %2d", ready_bits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4909,7 +4925,7 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8_t *obuf, uint32_t lengt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, bytes_per_sample, bytes_per_pixel, shift_width, result = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int32_t bytes_read = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmsize_t bytes_read = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t bps = 0, planar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t nstrips;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t strips_per_sample;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4975,7 +4991,7 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8_t *obuf, uint32_t lengt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ srcbuffs[s] = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- buff = limitMalloc(stripsize + 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ buff = limitMalloc(stripsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError ("readSeparateStripsIntoBuffer",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4998,7 +4514,7 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8_t *obuf, uint32_t lengt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buff = srcbuffs[s];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strip = (s * strips_per_sample) + j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytes_read = TIFFReadEncodedStrip (in, strip, buff, stripsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rows_this_strip = bytes_read / src_rowsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rows_this_strip = (uint32_t)(bytes_read / src_rowsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (bytes_read < 0 && !ignore)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError(TIFFFileName(in),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6061,13 +6077,14 @@ loadImage(TIFF* in, struct image_data *image, struct dump_opts *dump, unsigned c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t input_compression = 0, input_photometric = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t subsampling_horiz, subsampling_vert;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t width = 0, length = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t stsize = 0, tlsize = 0, buffsize = 0, scanlinesize = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmsize_t stsize = 0, tlsize = 0, buffsize = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmsize_t scanlinesize = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t tw = 0, tl = 0; /* Tile width and length */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t tile_rowsize = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmsize_t tile_rowsize = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char *read_buff = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char *new_buff = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int readunit = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static uint32_t prev_readsize = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static tmsize_t prev_readsize = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFGetFieldDefaulted(in, TIFFTAG_BITSPERSAMPLE, &bps);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFGetFieldDefaulted(in, TIFFTAG_SAMPLESPERPIXEL, &spp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6324,6 +6341,8 @@ loadImage(TIFF* in, struct image_data *image, struct dump_opts *dump, unsigned c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The buffsize_check and the possible adaptation of buffsize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * has to account also for padding of each line to a byte boundary.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This is assumed by mirrorImage() and rotateImage().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Furthermore, functions like extractContigSamplesShifted32bits()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * need a buffer, which is at least 3 bytes larger than the actual image.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Otherwise buffer-overflow might occur there.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buffsize_check = length * (uint32_t)(((width * spp * bps) + 7) / 8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6375,7 +6394,7 @@ loadImage(TIFF* in, struct image_data *image, struct dump_opts *dump, unsigned c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError("loadImage", "Unable to allocate/reallocate read buffer");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- read_buff = (unsigned char *)limitMalloc(buffsize+3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ read_buff = (unsigned char *)limitMalloc(buffsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6386,11 +6405,11 @@ loadImage(TIFF* in, struct image_data *image, struct dump_opts *dump, unsigned c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError("loadImage", "Unable to allocate/reallocate read buffer");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- new_buff = _TIFFrealloc(read_buff, buffsize+3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ new_buff = _TIFFrealloc(read_buff, buffsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!new_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free (read_buff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- read_buff = (unsigned char *)limitMalloc(buffsize+3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ read_buff = (unsigned char *)limitMalloc(buffsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ read_buff = new_buff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6463,8 +6482,13 @@ loadImage(TIFF* in, struct image_data *image, struct dump_opts *dump, unsigned c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_info (dump->infile, dump->format, "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Bits per sample %"PRIu16", Samples per pixel %"PRIu16, bps, spp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (scanlinesize > 0x0ffffffffULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_info(dump->infile, dump->format, "loadImage",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Attention: scanlinesize %"PRIu64" is larger than UINT32_MAX.\nFollowing dump might be wrong.",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanlinesize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < length; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dump_buffer(dump->infile, dump->format, 1, scanlinesize,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_buffer(dump->infile, dump->format, 1, (uint32_t)scanlinesize,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i, read_buff + (i * scanlinesize));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7484,13 +7508,13 @@ writeSingleSection(TIFF *in, TIFF *out, struct image_data *image,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (TIFFGetField(in, TIFFTAG_NUMBEROFINKS, &ninks)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFSetField(out, TIFFTAG_NUMBEROFINKS, ninks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (TIFFGetField(in, TIFFTAG_INKNAMES, &inknames)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int inknameslen = strlen(inknames) + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int inknameslen = (int)strlen(inknames) + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* cp = inknames;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (ninks > 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp = strchr(cp, '\0');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cp) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inknameslen += (strlen(cp) + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ inknameslen += ((int)strlen(cp) + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ninks--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7553,23 +7577,23 @@ createImageSection(uint32_t sectsize, unsigned char **sect_buff_ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!sect_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sect_buff = (unsigned char *)limitMalloc(sectsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sect_buff = (unsigned char *)limitMalloc(sectsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!sect_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError("createImageSection", "Unable to allocate/reallocate section buffer");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _TIFFmemset(sect_buff, 0, sectsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFmemset(sect_buff, 0, sectsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (prev_sectsize < sectsize)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- new_buff = _TIFFrealloc(sect_buff, sectsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ new_buff = _TIFFrealloc(sect_buff, sectsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!new_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _TIFFfree (sect_buff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sect_buff = (unsigned char *)limitMalloc(sectsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sect_buff = (unsigned char *)limitMalloc(sectsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sect_buff = new_buff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7579,7 +7603,7 @@ createImageSection(uint32_t sectsize, unsigned char **sect_buff_ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError("createImageSection", "Unable to allocate/reallocate section buffer");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _TIFFmemset(sect_buff, 0, sectsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFmemset(sect_buff, 0, sectsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7610,17 +7634,17 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cropsize = crop->bufftotal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crop_buff = seg_buffs[0].buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!crop_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- crop_buff = (unsigned char *)limitMalloc(cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crop_buff = (unsigned char *)limitMalloc(cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prev_cropsize = seg_buffs[0].size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (prev_cropsize < cropsize)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- next_buff = _TIFFrealloc(crop_buff, cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ next_buff = _TIFFrealloc(crop_buff, cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! next_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _TIFFfree (crop_buff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- crop_buff = (unsigned char *)limitMalloc(cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crop_buff = (unsigned char *)limitMalloc(cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crop_buff = next_buff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7633,7 +7657,7 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _TIFFmemset(crop_buff, 0, cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFmemset(crop_buff, 0, cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ seg_buffs[0].buffer = crop_buff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ seg_buffs[0].size = cropsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7713,17 +7737,17 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cropsize = crop->bufftotal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crop_buff = seg_buffs[i].buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!crop_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- crop_buff = (unsigned char *)limitMalloc(cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crop_buff = (unsigned char *)limitMalloc(cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prev_cropsize = seg_buffs[0].size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (prev_cropsize < cropsize)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- next_buff = _TIFFrealloc(crop_buff, cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ next_buff = _TIFFrealloc(crop_buff, cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! next_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _TIFFfree (crop_buff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- crop_buff = (unsigned char *)limitMalloc(cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crop_buff = (unsigned char *)limitMalloc(cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crop_buff = next_buff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7736,7 +7760,7 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _TIFFmemset(crop_buff, 0, cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFmemset(crop_buff, 0, cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ seg_buffs[i].buffer = crop_buff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ seg_buffs[i].size = cropsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7852,24 +7876,24 @@ createCroppedImage(struct image_data *image, struct crop_mask *crop,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crop_buff = *crop_buff_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!crop_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- crop_buff = (unsigned char *)limitMalloc(cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crop_buff = (unsigned char *)limitMalloc(cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!crop_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError("createCroppedImage", "Unable to allocate/reallocate crop buffer");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _TIFFmemset(crop_buff, 0, cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFmemset(crop_buff, 0, cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prev_cropsize = cropsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (prev_cropsize < cropsize)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- new_buff = _TIFFrealloc(crop_buff, cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ new_buff = _TIFFrealloc(crop_buff, cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!new_buff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free (crop_buff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- crop_buff = (unsigned char *)limitMalloc(cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crop_buff = (unsigned char *)limitMalloc(cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crop_buff = new_buff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7878,7 +7902,7 @@ createCroppedImage(struct image_data *image, struct crop_mask *crop,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError("createCroppedImage", "Unable to allocate/reallocate crop buffer");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _TIFFmemset(crop_buff, 0, cropsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFmemset(crop_buff, 0, cropsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8176,13 +8200,13 @@ writeCroppedImage(TIFF *in, TIFF *out, struct image_data *image,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (TIFFGetField(in, TIFFTAG_NUMBEROFINKS, &ninks)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFSetField(out, TIFFTAG_NUMBEROFINKS, ninks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (TIFFGetField(in, TIFFTAG_INKNAMES, &inknames)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int inknameslen = strlen(inknames) + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int inknameslen = (int)strlen(inknames) + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* cp = inknames;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (ninks > 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp = strchr(cp, '\0');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cp) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inknameslen += (strlen(cp) + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ inknameslen += ((int)strlen(cp) + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ninks--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8567,13 +8591,13 @@ rotateContigSamples32bits(uint16_t rotation, uint16_t spp, uint16_t bps, uint32_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else /* If we have a full buffer's worth, write it out */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff1 = (buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff1 = (uint8_t)(buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff2 = (buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff2 = (uint8_t)(buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff3 = (buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff3 = (uint8_t)(buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff4 = (buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff4 = (uint8_t)(buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ready_bits -= 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8642,12 +8666,13 @@ rotateImage(uint16_t rotation, struct image_data *image, uint32_t *img_width,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!(rbuff = (unsigned char *)limitMalloc(buffsize)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Add 3 padding bytes for extractContigSamplesShifted32bits */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!(rbuff = (unsigned char *)limitMalloc(buffsize + NUM_BUFF_OVERSIZE_BYTES)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TIFFError("rotateImage", "Unable to allocate rotation buffer of %1u bytes", buffsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFError("rotateImage", "Unable to allocate rotation buffer of %1u bytes", buffsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _TIFFmemset(rbuff, '\0', buffsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFmemset(rbuff, '\0', buffsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ibuff = *ibuff_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (rotation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9175,13 +9200,13 @@ reverseSamples32bits (uint16_t spp, uint16_t bps, uint32_t width,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else /* If we have a full buffer's worth, write it out */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff1 = (buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff1 = (uint8_t)(buff2 >> 56);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff2 = (buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff2 = (uint8_t)(buff2 >> 48);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff3 = (buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff3 = (uint8_t)(buff2 >> 40);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytebuff4 = (buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytebuff4 = (uint8_t)(buff2 >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *dst++ = bytebuff4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ready_bits -= 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9272,12 +9297,13 @@ mirrorImage(uint16_t spp, uint16_t bps, uint16_t mirror, uint32_t width, uint32_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case MIRROR_BOTH:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case MIRROR_VERT:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- line_buff = (unsigned char *)limitMalloc(rowsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ line_buff = (unsigned char *)limitMalloc(rowsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (line_buff == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TIFFError ("mirrorImage", "Unable to allocate mirror line buffer of %1u bytes", rowsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFError ("mirrorImage", "Unable to allocate mirror line buffer of %1u bytes", rowsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFmemset(line_buff, '\0', rowsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst = ibuff + (rowsize * (length - 1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (row = 0; row < length / 2; row++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9309,11 +9335,12 @@ mirrorImage(uint16_t spp, uint16_t bps, uint16_t mirror, uint32_t width, uint32_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { /* non 8 bit per sample data */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!(line_buff = (unsigned char *)limitMalloc(rowsize + 1)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!(line_buff = (unsigned char *)limitMalloc(rowsize + NUM_BUFF_OVERSIZE_BYTES)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFError("mirrorImage", "Unable to allocate mirror line buffer");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFmemset(line_buff, '\0', rowsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytes_per_sample = (bps + 7) / 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytes_per_pixel = ((bps * spp) + 7) / 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (bytes_per_pixel < (bytes_per_sample + 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9325,7 +9352,7 @@ mirrorImage(uint16_t spp, uint16_t bps, uint16_t mirror, uint32_t width, uint32_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ row_offset = row * rowsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src = ibuff + row_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _TIFFmemset (line_buff, '\0', rowsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFmemset (line_buff, '\0', rowsize + NUM_BUFF_OVERSIZE_BYTES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (shift_width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 1: if (reverseSamples16bits(spp, bps, width, src, line_buff))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tiff/files/CVE-2022-3597_CVE-2022-3626_CVE-2022-3627.patch b/graphics/tiff/files/CVE-2022-3597_CVE-2022-3626_CVE-2022-3627.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..65476e6c7f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tiff/files/CVE-2022-3597_CVE-2022-3626_CVE-2022-3627.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,101 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4746f16253b784287bc8a5003990c1c3b9a03a62 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Su_Laus <sulau@freenet.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 25 Aug 2022 16:11:41 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] tiffcrop: disable incompatibility of -Z, -X, -Y, -z options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with any PAGE_MODE_x option (fixes #411 and #413)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tiffcrop does not support –Z, -z, -X and –Y options together with any other PAGE_MODE_x options like -H, -V, -P, -J, -K or –S.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Code analysis:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+With the options –Z, -z, the crop.selections are set to a value > 0. Within main(), this triggers the call of processCropSelections(), which copies the sections from the read_buff into seg_buffs[].
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In the following code in main(), the only supported step, where that seg_buffs are further handled are within an if-clause with if (page.mode == PAGE_MODE_NONE) .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Execution of the else-clause often leads to buffer-overflows.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Therefore, the above option combination is not supported and will be disabled to prevent those buffer-overflows.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The MR solves issues #411 and #413.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doc/tools/tiffcrop.rst | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/tiffcrop.c | 32 +++++++++++++++++++++++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 33 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8fd856dc..41a2ea36 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/tiffcrop.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,10 +107,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * selects which functions dump data, with higher numbers selecting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * lower level, scanline level routines. Debug reports a limited set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * of messages to monitor progress without enabling dump logs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Note: The (-X|-Y), -Z and -z options are mutually exclusive.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Note 1: The (-X|-Y), -Z, -z and -S options are mutually exclusive.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * In no case should the options be applied to a given selection successively.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Note 2: Any of the -X, -Y, -Z and -z options together with other PAGE_MODE_x options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * such as -H, -V, -P, -J or -K are not supported and may cause buffer overflows.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char tiffcrop_version_id[] = "2.5";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char tiffcrop_rev_date[] = "02-09-2022";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -781,9 +783,12 @@ static const char usage_info[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " The four debug/dump options are independent, though it makes little sense to\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " specify a dump file without specifying a detail level.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"Note: The (-X|-Y), -Z and -z options are mutually exclusive.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"Note 1: The (-X|-Y), -Z, -z and -S options are mutually exclusive.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " In no case should the options be applied to a given selection successively.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"Note 2: Any of the -X, -Y, -Z and -z options together with other PAGE_MODE_x options\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++" such as - H, -V, -P, -J or -K are not supported and may cause buffer overflows.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This function could be modified to pass starting sample offset
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2137,9 +2142,20 @@ void process_command_opts (int argc, ch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Z = (crop_data->crop_mode & CROP_ZONES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ R = (crop_data->crop_mode & CROP_REGIONS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((XY && Z) || (XY && R) || (Z && R)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z and -z are mutually exclusive.->Exit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->exit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Check for not allowed combination:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Any of the -X, -Y, -Z and -z options together with other PAGE_MODE_x options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * such as -H, -V, -P, -J or -K are not supported and may cause buffer overflows.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((XY + Z + R > 0) && page->mode != PAGE_MODE_NONE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFError("tiffcrop input error",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Any of the crop options -X, -Y, -Z and -z together with other PAGE_MODE_x options such as - H, -V, -P, -J or -K is not supported and may cause buffer overflows..->exit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* end process_command_opts */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Start a new output file if one has not been previously opened or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2410,6 +2426,7 @@ main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit (EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Crop input image and copy zones and regions from input image into seg_buffs or crop_buff. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (crop.selections > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (processCropSelections(&image, &crop, &read_buff, seg_buffs))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2426,6 +2443,7 @@ main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit (EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Format and write selected image parts to output file(s). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (page.mode == PAGE_MODE_NONE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { /* Whole image or sections not based on output page size */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (crop.selections > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tiff/files/CVE-2022-3598.patch b/graphics/tiff/files/CVE-2022-3598.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fd7e39b391b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tiff/files/CVE-2022-3598.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From afd7086090dafd3949afd172822cbcec4ed17d56 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Su Laus <sulau@freenet.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 13 Oct 2022 14:33:27 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] tiffcrop subroutines require a larger buffer (fixes #271,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #381, #386, #388, #389, #435)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/tiffcrop.c | 209 ++++++++++++++++++++++++++---------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 118 insertions(+), 91 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 41a2ea36..deab5feb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/tiffcrop.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/tiffcrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -237,7 +237,7 @@ struct offset {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct buffinfo {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint64_t size; /* size of this buffer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t size; /* size of this buffer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char *buffer; /* address of the allocated buffer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1247,6 +1247,11 @@ writeBufferToSeparateStrips (TIFF* out,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Attention: scanlinesize %"PRIu64" is larger than UINT32_MAX.\nFollowing dump might be wrong.",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scanlinesize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (scanlinesize > 0x0ffffffffULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dump_info(dump->infile, dump->format, "loadImage",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Attention: scanlinesize %"PRIu64" is larger than UINT32_MAX.\nFollowing dump might be wrong.",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanlinesize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_info(dump->outfile, dump->format,"",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Sample %2d, Strip: %2d, bytes: %4d, Row %4d, bytes: %4d, Input offset: %6d",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s + 1, strip + 1, stripsize, row + 1, (uint32_t)scanlinesize, src - buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tiff/files/CVE-2022-3599.patch b/graphics/tiff/files/CVE-2022-3599.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0604df02139
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tiff/files/CVE-2022-3599.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,262 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f00484b9519df933723deb38fff943dc291a793d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Su_Laus <sulau@freenet.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 30 Aug 2022 16:56:48 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Revised handling of TIFFTAG_INKNAMES and related
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFTAG_NUMBEROFINKS value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In order to solve the buffer overflow issues related to TIFFTAG_INKNAMES and related TIFFTAG_NUMBEROFINKS value, a revised handling of those tags within LibTiff is proposed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Behaviour for writing:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `NumberOfInks` MUST fit to the number of inks in the `InkNames` string.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `NumberOfInks` is automatically set when `InkNames` is set.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If `NumberOfInks` is different to the number of inks within `InkNames` string, that will be corrected and a warning is issued.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If `NumberOfInks` is not equal to samplesperpixel only a warning will be issued.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Behaviour for reading:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ When reading `InkNames` from a TIFF file, the `NumberOfInks` will be set automatically to the number of inks in `InkNames` string.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If `NumberOfInks` is different to the number of inks within `InkNames` string, that will be corrected and a warning is issued.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If `NumberOfInks` is not equal to samplesperpixel only a warning will be issued.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This allows the safe use of the NumberOfInks value to read out the InkNames without buffer overflow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This MR will close the following issues: #149, #150, #152, #168 (to be checked), #250, #269, #398 and #456.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It also fixes the old bug at http://bugzilla.maptools.org/show_bug.cgi?id=2599, for which the limitation of `NumberOfInks = SPP` was introduced, which is in my opinion not necessary and does not solve the general issue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libtiff/tif_dir.c | 119 ++++++++++++++++++++++++-----------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libtiff/tif_dir.h | 2 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libtiff/tif_dirinfo.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libtiff/tif_dirwrite.c | 5 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libtiff/tif_print.c | 4 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 82 insertions(+), 50 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 793e8a79..816f7756 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtiff/tif_dir.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtiff/tif_dir.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,32 +136,30 @@ setExtraSamples(TIFF* tif, va_list ap, uint32_t* v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Confirm we have "samplesperpixel" ink names separated by \0. Returns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Count ink names separated by \0. Returns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * zero if the ink names are not as expected.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static uint32_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-checkInkNamesString(TIFF* tif, uint32_t slen, const char* s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static uint16_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++countInkNamesString(TIFF *tif, uint32_t slen, const char *s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TIFFDirectory* td = &tif->tif_dir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t i = td->td_samplesperpixel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t i = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *ep = s + slen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *cp = s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (slen > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const char* ep = s+slen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const char* cp = s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (; i > 0; i--) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (; cp < ep && *cp != '\0'; cp++) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cp >= ep)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto bad;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp++; /* skip \0 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return ((uint32_t)(cp - s));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ i++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } while (cp < ep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bad:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFErrorExt(tif->tif_clientdata, "TIFFSetField",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "%s: Invalid InkNames value; expecting %"PRIu16" names, found %"PRIu16,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tif->tif_name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- td->td_samplesperpixel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (uint16_t)(td->td_samplesperpixel-i));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "%s: Invalid InkNames value; no NUL at given buffer end location %"PRIu32", after %"PRIu16" ink",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tif->tif_name, slen, i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -475,13 +473,61 @@ _TIFFVSetField(TIFF* tif, uint32_t tag, va_list ap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _TIFFsetFloatArray(&td->td_refblackwhite, va_arg(ap, float*), 6);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case TIFFTAG_INKNAMES:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- v = (uint16_t) va_arg(ap, uint16_vap);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- s = va_arg(ap, char*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- v = checkInkNamesString(tif, v, s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- status = v > 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( v > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _TIFFsetNString(&td->td_inknames, s, v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- td->td_inknameslen = v;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ v = (uint16_t) va_arg(ap, uint16_vap);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s = va_arg(ap, char*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t ninksinstring;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ninksinstring = countInkNamesString(tif, v, s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status = ninksinstring > 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(ninksinstring > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _TIFFsetNString(&td->td_inknames, s, v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ td->td_inknameslen = v;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Set NumberOfInks to the value ninksinstring */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (TIFFFieldSet(tif, FIELD_NUMBEROFINKS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (td->td_numberofinks != ninksinstring) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFErrorExt(tif->tif_clientdata, module,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Warning %s; Tag %s:\n Value %"PRIu16" of NumberOfInks is different from the number of inks %"PRIu16".\n -> NumberOfInks value adapted to %"PRIu16"",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tif->tif_name, fip->field_name, td->td_numberofinks, ninksinstring, ninksinstring);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ td->td_numberofinks = ninksinstring;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ td->td_numberofinks = ninksinstring;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFSetFieldBit(tif, FIELD_NUMBEROFINKS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (TIFFFieldSet(tif, FIELD_SAMPLESPERPIXEL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (td->td_numberofinks != td->td_samplesperpixel) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFErrorExt(tif->tif_clientdata, module,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Warning %s; Tag %s:\n Value %"PRIu16" of NumberOfInks is different from the SamplesPerPixel value %"PRIu16"",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tif->tif_name, fip->field_name, td->td_numberofinks, td->td_samplesperpixel);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case TIFFTAG_NUMBEROFINKS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ v = (uint16_t)va_arg(ap, uint16_vap);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* If InkNames already set also NumberOfInks is set accordingly and should be equal */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (TIFFFieldSet(tif, FIELD_INKNAMES))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (v != td->td_numberofinks) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFErrorExt(tif->tif_clientdata, module,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Error %s; Tag %s:\n It is not possible to set the value %"PRIu32" for NumberOfInks\n which is different from the number of inks in the InkNames tag (%"PRIu16")",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tif->tif_name, fip->field_name, v, td->td_numberofinks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Do not set / overwrite number of inks already set by InkNames case accordingly. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ td->td_numberofinks = (uint16_t)v;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (TIFFFieldSet(tif, FIELD_SAMPLESPERPIXEL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (td->td_numberofinks != td->td_samplesperpixel) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TIFFErrorExt(tif->tif_clientdata, module,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Warning %s; Tag %s:\n Value %"PRIu32" of NumberOfInks is different from the SamplesPerPixel value %"PRIu16"",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tif->tif_name, fip->field_name, v, td->td_samplesperpixel);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case TIFFTAG_PERSAMPLE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -915,34 +961,6 @@ _TIFFVGetField(TIFF* tif, uint32_t tag, va_list ap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fip->field_bit == FIELD_CUSTOM) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ standard_tag = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( standard_tag == TIFFTAG_NUMBEROFINKS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (i = 0; i < td->td_customValueCount; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t val;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TIFFTagValue *tv = td->td_customValues + i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (tv->info->field_tag != standard_tag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( tv->value == NULL )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- val = *(uint16_t *)tv->value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Truncate to SamplesPerPixel, since the */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* setting code for INKNAMES assume that there are SamplesPerPixel */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* inknames. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2599 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( val > td->td_samplesperpixel )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TIFFWarningExt(tif->tif_clientdata,"_TIFFVGetField",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Truncating NumberOfInks from %u to %"PRIu16,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- val, td->td_samplesperpixel);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- val = td->td_samplesperpixel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *va_arg(ap, uint16_t*) = val;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (standard_tag) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case TIFFTAG_SUBFILETYPE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1124,6 +1142,9 @@ _TIFFVGetField(TIFF* tif, uint32_t tag, va_list ap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case TIFFTAG_INKNAMES:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *va_arg(ap, const char**) = td->td_inknames;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case TIFFTAG_NUMBEROFINKS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *va_arg(ap, uint16_t *) = td->td_numberofinks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 09065648..0c251c9e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtiff/tif_dir.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtiff/tif_dir.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,6 +117,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* CMYK parameters */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int td_inknameslen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* td_inknames;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t td_numberofinks; /* number of inks in InkNames string */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int td_customValueCount;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFTagValue *td_customValues;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,6 +175,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FIELD_TRANSFERFUNCTION 44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FIELD_INKNAMES 46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FIELD_SUBIFD 49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FIELD_NUMBEROFINKS 50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* FIELD_CUSTOM (see tiffio.h) 65 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end of support for well-known tags; codec-private tags follow */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FIELD_CODEC 66 /* base of codec-private tags */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3371cb5c..3b4bcd33 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtiff/tif_dirinfo.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtiff/tif_dirinfo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,7 +114,7 @@ tiffFields[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { TIFFTAG_SUBIFD, -1, -1, TIFF_IFD8, 0, TIFF_SETGET_C16_IFD8, TIFF_SETGET_UNDEFINED, FIELD_SUBIFD, 1, 1, "SubIFD", (TIFFFieldArray*) &tiffFieldArray },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { TIFFTAG_INKSET, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "InkSet", NULL },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { TIFFTAG_INKNAMES, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_C16_ASCII, TIFF_SETGET_UNDEFINED, FIELD_INKNAMES, 1, 1, "InkNames", NULL },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { TIFFTAG_NUMBEROFINKS, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "NumberOfInks", NULL },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { TIFFTAG_NUMBEROFINKS, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_NUMBEROFINKS, 1, 0, "NumberOfInks", NULL },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { TIFFTAG_DOTRANGE, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_UINT16_PAIR, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DotRange", NULL },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { TIFFTAG_TARGETPRINTER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TargetPrinter", NULL },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { TIFFTAG_EXTRASAMPLES, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_EXTRASAMPLES, 0, 1, "ExtraSamples", NULL },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6c86fdca..062e4610 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtiff/tif_dirwrite.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtiff/tif_dirwrite.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -708,6 +708,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64_t* pdiroff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!TIFFWriteDirectoryTagAscii(tif,&ndir,dir,TIFFTAG_INKNAMES,tif->tif_dir.td_inknameslen,tif->tif_dir.td_inknames))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto bad;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (TIFFFieldSet(tif, FIELD_NUMBEROFINKS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!TIFFWriteDirectoryTagShort(tif, &ndir, dir, TIFFTAG_NUMBEROFINKS, tif->tif_dir.td_numberofinks))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto bad;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (TIFFFieldSet(tif,FIELD_SUBIFD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!TIFFWriteDirectoryTagSubifd(tif,&ndir,dir))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 16ce5780..a91b9e7b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtiff/tif_print.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtiff/tif_print.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -401,6 +401,10 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fputs("\n", fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (TIFFFieldSet(tif, FIELD_NUMBEROFINKS)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(fd, " NumberOfInks: %d\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ td->td_numberofinks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (TIFFFieldSet(tif,FIELD_THRESHHOLDING)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(fd, " Thresholding: ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (td->td_threshholding) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>