But that looks like a different problem, in testing, rather than setting up the build.
Alex On Fri, 6 Jan 2023 at 09:14, Khem Raj <[email protected]> wrote: > > On Thu, Jan 5, 2023 at 10:17 PM Alexander Kanavin > <[email protected]> wrote: > > > > The regression seems local to your setup. On poky, gtk4-native builds fine: > > > > Run-time dependency libtiff-4 found: YES 4.5.0 > > > > Or it's caused by something else still. > > debian folks are also seeing problem > https://www.mail-archive.com/[email protected]/msg1886646.html > > > > > Alex > > > > On Fri, 6 Jan 2023 at 04:12, Khem Raj <[email protected]> wrote: > > > > > > This regresses building gtk4-native. meson/configure fails > > > > > > Found CMake: > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/gtk4-native/4.8.2-r0/recipe-sysroot-native/usr/bin/cmake > > > (3.25.1) > > > Run-time dependency libtiff-4 found: NO (tried pkgconfig and cmake) > > > Looking for a fallback subproject for the dependency libtiff-4 > > > > > > ../gtk-4.8.2/meson.build:427:0: ERROR: Automatic wrap-based subproject > > > downloading is disabled > > > > > > On Wed, Jan 4, 2023 at 3:06 AM Alexander Kanavin <[email protected]> > > > wrote: > > > > > > > > Drop all CVE backports. > > > > > > > > License-Update: formatting > > > > > > > > Signed-off-by: Alexander Kanavin <[email protected]> > > > > --- > > > > ...-of-TIFFTAG_INKNAMES-and-related-TIF.patch | 266 ------- > > > > ...-the-FPE-in-tiffcrop-415-427-and-428.patch | 184 ----- > > > > ...fcrop-S-option-Make-decision-simpler.patch | 36 - > > > > ...-incompatibility-of-Z-X-Y-z-options-.patch | 59 -- > > > > ...ines-require-a-larger-buffer-fixes-2.patch | 653 ------------------ > > > > .../libtiff/files/CVE-2022-2953.patch | 86 --- > > > > .../libtiff/files/CVE-2022-34526.patch | 32 - > > > > .../libtiff/files/CVE-2022-3970.patch | 39 -- > > > > .../libtiff/{tiff_4.4.0.bb => tiff_4.5.0.bb} | 17 +- > > > > 9 files changed, 4 insertions(+), 1368 deletions(-) > > > > delete mode 100644 > > > > meta/recipes-multimedia/libtiff/files/0001-Revised-handling-of-TIFFTAG_INKNAMES-and-related-TIF.patch > > > > delete mode 100644 > > > > meta/recipes-multimedia/libtiff/files/0001-fix-the-FPE-in-tiffcrop-415-427-and-428.patch > > > > delete mode 100644 > > > > meta/recipes-multimedia/libtiff/files/0001-tiffcrop-S-option-Make-decision-simpler.patch > > > > delete mode 100644 > > > > meta/recipes-multimedia/libtiff/files/0001-tiffcrop-disable-incompatibility-of-Z-X-Y-z-options-.patch > > > > delete mode 100644 > > > > meta/recipes-multimedia/libtiff/files/0001-tiffcrop-subroutines-require-a-larger-buffer-fixes-2.patch > > > > delete mode 100644 > > > > meta/recipes-multimedia/libtiff/files/CVE-2022-2953.patch > > > > delete mode 100644 > > > > meta/recipes-multimedia/libtiff/files/CVE-2022-34526.patch > > > > delete mode 100644 > > > > meta/recipes-multimedia/libtiff/files/CVE-2022-3970.patch > > > > rename meta/recipes-multimedia/libtiff/{tiff_4.4.0.bb => > > > > tiff_4.5.0.bb} (75%) > > > > > > > > diff --git > > > > a/meta/recipes-multimedia/libtiff/files/0001-Revised-handling-of-TIFFTAG_INKNAMES-and-related-TIF.patch > > > > > > > > b/meta/recipes-multimedia/libtiff/files/0001-Revised-handling-of-TIFFTAG_INKNAMES-and-related-TIF.patch > > > > deleted file mode 100644 > > > > index ce72c86120..0000000000 > > > > --- > > > > a/meta/recipes-multimedia/libtiff/files/0001-Revised-handling-of-TIFFTAG_INKNAMES-and-related-TIF.patch > > > > +++ /dev/null > > > > @@ -1,266 +0,0 @@ > > > > -CVE: CVE-2022-3599 > > > > -Upstream-Status: Backport > > > > -Signed-off-by: Ross Burton <[email protected]> > > > > - > > > > -From f00484b9519df933723deb38fff943dc291a793d Mon Sep 17 00:00:00 2001 > > > > -From: Su_Laus <[email protected]> > > > > -Date: Tue, 30 Aug 2022 16:56:48 +0200 > > > > -Subject: [PATCH] Revised handling of TIFFTAG_INKNAMES and related > > > > - TIFFTAG_NUMBEROFINKS value > > > > - > > > > -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: > > > > - > > > > -Behaviour for writing: > > > > - `NumberOfInks` MUST fit to the number of inks in the `InkNames` > > > > string. > > > > - `NumberOfInks` is automatically set when `InkNames` is set. > > > > - If `NumberOfInks` is different to the number of inks within > > > > `InkNames` string, that will be corrected and a warning is issued. > > > > - If `NumberOfInks` is not equal to samplesperpixel only a warning > > > > will be issued. > > > > - > > > > -Behaviour for reading: > > > > - When reading `InkNames` from a TIFF file, the `NumberOfInks` will > > > > be set automatically to the number of inks in `InkNames` string. > > > > - If `NumberOfInks` is different to the number of inks within > > > > `InkNames` string, that will be corrected and a warning is issued. > > > > - If `NumberOfInks` is not equal to samplesperpixel only a warning > > > > will be issued. > > > > - > > > > -This allows the safe use of the NumberOfInks value to read out the > > > > InkNames without buffer overflow > > > > - > > > > -This MR will close the following issues: #149, #150, #152, #168 (to > > > > be checked), #250, #269, #398 and #456. > > > > - > > > > -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. > > > > ---- > > > > - libtiff/tif_dir.c | 119 ++++++++++++++++++++++++----------------- > > > > - libtiff/tif_dir.h | 2 + > > > > - libtiff/tif_dirinfo.c | 2 +- > > > > - libtiff/tif_dirwrite.c | 5 ++ > > > > - libtiff/tif_print.c | 4 ++ > > > > - 5 files changed, 82 insertions(+), 50 deletions(-) > > > > - > > > > -diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c > > > > -index 793e8a79..816f7756 100644 > > > > ---- a/libtiff/tif_dir.c > > > > -+++ b/libtiff/tif_dir.c > > > > -@@ -136,32 +136,30 @@ setExtraSamples(TIFF* tif, va_list ap, uint32_t* > > > > v) > > > > - } > > > > - > > > > - /* > > > > -- * Confirm we have "samplesperpixel" ink names separated by \0. > > > > Returns > > > > -+ * Count ink names separated by \0. Returns > > > > - * zero if the ink names are not as expected. > > > > - */ > > > > --static uint32_t > > > > --checkInkNamesString(TIFF* tif, uint32_t slen, const char* s) > > > > -+static uint16_t > > > > -+countInkNamesString(TIFF *tif, uint32_t slen, const char *s) > > > > - { > > > > -- TIFFDirectory* td = &tif->tif_dir; > > > > -- uint16_t i = td->td_samplesperpixel; > > > > -+ uint16_t i = 0; > > > > -+ const char *ep = s + slen; > > > > -+ const char *cp = s; > > > > - > > > > - if (slen > 0) { > > > > -- const char* ep = s+slen; > > > > -- const char* cp = s; > > > > -- for (; i > 0; i--) { > > > > -+ do { > > > > - for (; cp < ep && *cp != '\0'; cp++) {} > > > > - if (cp >= ep) > > > > - goto bad; > > > > - cp++; /* skip \0 */ > > > > -- } > > > > -- return ((uint32_t)(cp - s)); > > > > -+ i++; > > > > -+ } while (cp < ep); > > > > -+ return (i); > > > > - } > > > > - bad: > > > > - TIFFErrorExt(tif->tif_clientdata, "TIFFSetField", > > > > -- "%s: Invalid InkNames value; expecting %"PRIu16" names, > > > > found %"PRIu16, > > > > -- tif->tif_name, > > > > -- td->td_samplesperpixel, > > > > -- (uint16_t)(td->td_samplesperpixel-i)); > > > > -+ "%s: Invalid InkNames value; no NUL at given buffer end > > > > location %"PRIu32", after %"PRIu16" ink", > > > > -+ tif->tif_name, slen, i); > > > > - return (0); > > > > - } > > > > - > > > > -@@ -478,13 +476,61 @@ _TIFFVSetField(TIFF* tif, uint32_t tag, va_list > > > > ap) > > > > - _TIFFsetFloatArray(&td->td_refblackwhite, va_arg(ap, > > > > float*), 6); > > > > - break; > > > > - case TIFFTAG_INKNAMES: > > > > -- v = (uint16_t) va_arg(ap, uint16_vap); > > > > -- s = va_arg(ap, char*); > > > > -- v = checkInkNamesString(tif, v, s); > > > > -- status = v > 0; > > > > -- if( v > 0 ) { > > > > -- _TIFFsetNString(&td->td_inknames, s, v); > > > > -- td->td_inknameslen = v; > > > > -+ { > > > > -+ v = (uint16_t) va_arg(ap, uint16_vap); > > > > -+ s = va_arg(ap, char*); > > > > -+ uint16_t ninksinstring; > > > > -+ ninksinstring = countInkNamesString(tif, v, s); > > > > -+ status = ninksinstring > 0; > > > > -+ if(ninksinstring > 0 ) { > > > > -+ _TIFFsetNString(&td->td_inknames, s, v); > > > > -+ td->td_inknameslen = v; > > > > -+ /* Set NumberOfInks to the value > > > > ninksinstring */ > > > > -+ if (TIFFFieldSet(tif, > > > > FIELD_NUMBEROFINKS)) > > > > -+ { > > > > -+ if (td->td_numberofinks != > > > > ninksinstring) { > > > > -+ > > > > TIFFErrorExt(tif->tif_clientdata, module, > > > > -+ "Warning %s; > > > > Tag %s:\n Value %"PRIu16" of NumberOfInks is different from the number > > > > of inks %"PRIu16".\n -> NumberOfInks value adapted to %"PRIu16"", > > > > -+ tif->tif_name, > > > > fip->field_name, td->td_numberofinks, ninksinstring, ninksinstring); > > > > -+ td->td_numberofinks = > > > > ninksinstring; > > > > -+ } > > > > -+ } else { > > > > -+ td->td_numberofinks = > > > > ninksinstring; > > > > -+ TIFFSetFieldBit(tif, > > > > FIELD_NUMBEROFINKS); > > > > -+ } > > > > -+ if (TIFFFieldSet(tif, > > > > FIELD_SAMPLESPERPIXEL)) > > > > -+ { > > > > -+ if (td->td_numberofinks != > > > > td->td_samplesperpixel) { > > > > -+ > > > > TIFFErrorExt(tif->tif_clientdata, module, > > > > -+ "Warning %s; > > > > Tag %s:\n Value %"PRIu16" of NumberOfInks is different from the > > > > SamplesPerPixel value %"PRIu16"", > > > > -+ tif->tif_name, > > > > fip->field_name, td->td_numberofinks, td->td_samplesperpixel); > > > > -+ } > > > > -+ } > > > > -+ } > > > > -+ } > > > > -+ break; > > > > -+ case TIFFTAG_NUMBEROFINKS: > > > > -+ v = (uint16_t)va_arg(ap, uint16_vap); > > > > -+ /* If InkNames already set also NumberOfInks is set > > > > accordingly and should be equal */ > > > > -+ if (TIFFFieldSet(tif, FIELD_INKNAMES)) > > > > -+ { > > > > -+ if (v != td->td_numberofinks) { > > > > -+ TIFFErrorExt(tif->tif_clientdata, > > > > module, > > > > -+ "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")", > > > > -+ tif->tif_name, fip->field_name, > > > > v, td->td_numberofinks); > > > > -+ /* Do not set / overwrite number of > > > > inks already set by InkNames case accordingly. */ > > > > -+ status = 0; > > > > -+ } > > > > -+ } else { > > > > -+ td->td_numberofinks = (uint16_t)v; > > > > -+ if (TIFFFieldSet(tif, FIELD_SAMPLESPERPIXEL)) > > > > -+ { > > > > -+ if (td->td_numberofinks != > > > > td->td_samplesperpixel) { > > > > -+ > > > > TIFFErrorExt(tif->tif_clientdata, module, > > > > -+ "Warning %s; Tag %s:\n > > > > Value %"PRIu32" of NumberOfInks is different from the SamplesPerPixel > > > > value %"PRIu16"", > > > > -+ tif->tif_name, > > > > fip->field_name, v, td->td_samplesperpixel); > > > > -+ } > > > > -+ } > > > > - } > > > > - break; > > > > - case TIFFTAG_PERSAMPLE: > > > > -@@ -986,34 +1032,6 @@ _TIFFVGetField(TIFF* tif, uint32_t tag, va_list > > > > ap) > > > > - if (fip->field_bit == FIELD_CUSTOM) { > > > > - standard_tag = 0; > > > > - } > > > > -- > > > > -- if( standard_tag == TIFFTAG_NUMBEROFINKS ) > > > > -- { > > > > -- int i; > > > > -- for (i = 0; i < td->td_customValueCount; i++) { > > > > -- uint16_t val; > > > > -- TIFFTagValue *tv = td->td_customValues + i; > > > > -- if (tv->info->field_tag != standard_tag) > > > > -- continue; > > > > -- if( tv->value == NULL ) > > > > -- return 0; > > > > -- val = *(uint16_t *)tv->value; > > > > -- /* Truncate to SamplesPerPixel, since the */ > > > > -- /* setting code for INKNAMES assume that there are > > > > SamplesPerPixel */ > > > > -- /* inknames. */ > > > > -- /* Fixes > > > > http://bugzilla.maptools.org/show_bug.cgi?id=2599 */ > > > > -- if( val > td->td_samplesperpixel ) > > > > -- { > > > > -- > > > > TIFFWarningExt(tif->tif_clientdata,"_TIFFVGetField", > > > > -- "Truncating NumberOfInks from %u > > > > to %"PRIu16, > > > > -- val, td->td_samplesperpixel); > > > > -- val = td->td_samplesperpixel; > > > > -- } > > > > -- *va_arg(ap, uint16_t*) = val; > > > > -- return 1; > > > > -- } > > > > -- return 0; > > > > -- } > > > > - > > > > - switch (standard_tag) { > > > > - case TIFFTAG_SUBFILETYPE: > > > > -@@ -1195,6 +1213,9 @@ _TIFFVGetField(TIFF* tif, uint32_t tag, va_list > > > > ap) > > > > - case TIFFTAG_INKNAMES: > > > > - *va_arg(ap, const char**) = td->td_inknames; > > > > - break; > > > > -+ case TIFFTAG_NUMBEROFINKS: > > > > -+ *va_arg(ap, uint16_t *) = td->td_numberofinks; > > > > -+ break; > > > > - default: > > > > - { > > > > - int i; > > > > -diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h > > > > -index 09065648..0c251c9e 100644 > > > > ---- a/libtiff/tif_dir.h > > > > -+++ b/libtiff/tif_dir.h > > > > -@@ -117,6 +117,7 @@ typedef struct { > > > > - /* CMYK parameters */ > > > > - int td_inknameslen; > > > > - char* td_inknames; > > > > -+ uint16_t td_numberofinks; /* number of inks in > > > > InkNames string */ > > > > - > > > > - int td_customValueCount; > > > > - TIFFTagValue *td_customValues; > > > > -@@ -174,6 +175,7 @@ typedef struct { > > > > - #define FIELD_TRANSFERFUNCTION 44 > > > > - #define FIELD_INKNAMES 46 > > > > - #define FIELD_SUBIFD 49 > > > > -+#define FIELD_NUMBEROFINKS 50 > > > > - /* FIELD_CUSTOM (see tiffio.h) 65 */ > > > > - /* end of support for well-known tags; codec-private tags follow */ > > > > - #define FIELD_CODEC 66 /* base of codec-private > > > > tags */ > > > > -diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c > > > > -index 3371cb5c..3b4bcd33 100644 > > > > ---- a/libtiff/tif_dirinfo.c > > > > -+++ b/libtiff/tif_dirinfo.c > > > > -@@ -114,7 +114,7 @@ tiffFields[] = { > > > > - { TIFFTAG_SUBIFD, -1, -1, TIFF_IFD8, 0, TIFF_SETGET_C16_IFD8, > > > > TIFF_SETGET_UNDEFINED, FIELD_SUBIFD, 1, 1, "SubIFD", (TIFFFieldArray*) > > > > &tiffFieldArray }, > > > > - { TIFFTAG_INKSET, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, > > > > TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "InkSet", NULL }, > > > > - { TIFFTAG_INKNAMES, -1, -1, TIFF_ASCII, 0, > > > > TIFF_SETGET_C16_ASCII, TIFF_SETGET_UNDEFINED, FIELD_INKNAMES, 1, 1, > > > > "InkNames", NULL }, > > > > -- { TIFFTAG_NUMBEROFINKS, 1, 1, TIFF_SHORT, 0, > > > > TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, > > > > "NumberOfInks", NULL }, > > > > -+ { TIFFTAG_NUMBEROFINKS, 1, 1, TIFF_SHORT, 0, > > > > TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_NUMBEROFINKS, 1, 0, > > > > "NumberOfInks", NULL }, > > > > - { TIFFTAG_DOTRANGE, 2, 2, TIFF_SHORT, 0, > > > > TIFF_SETGET_UINT16_PAIR, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, > > > > "DotRange", NULL }, > > > > - { TIFFTAG_TARGETPRINTER, -1, -1, TIFF_ASCII, 0, > > > > TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, > > > > "TargetPrinter", NULL }, > > > > - { TIFFTAG_EXTRASAMPLES, -1, -1, TIFF_SHORT, 0, > > > > TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_EXTRASAMPLES, 0, > > > > 1, "ExtraSamples", NULL }, > > > > -diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c > > > > -index 6c86fdca..062e4610 100644 > > > > ---- a/libtiff/tif_dirwrite.c > > > > -+++ b/libtiff/tif_dirwrite.c > > > > -@@ -626,6 +626,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int > > > > imagedone, uint64_t* pdiroff) > > > > - if > > > > (!TIFFWriteDirectoryTagAscii(tif,&ndir,dir,TIFFTAG_INKNAMES,tif->tif_dir.td_inknameslen,tif->tif_dir.td_inknames)) > > > > - goto bad; > > > > - } > > > > -+ if (TIFFFieldSet(tif, FIELD_NUMBEROFINKS)) > > > > -+ { > > > > -+ if (!TIFFWriteDirectoryTagShort(tif, > > > > &ndir, dir, TIFFTAG_NUMBEROFINKS, tif->tif_dir.td_numberofinks)) > > > > -+ goto bad; > > > > -+ } > > > > - if (TIFFFieldSet(tif,FIELD_SUBIFD)) > > > > - { > > > > - if > > > > (!TIFFWriteDirectoryTagSubifd(tif,&ndir,dir)) > > > > -diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c > > > > -index 16ce5780..a91b9e7b 100644 > > > > ---- a/libtiff/tif_print.c > > > > -+++ b/libtiff/tif_print.c > > > > -@@ -397,6 +397,10 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long > > > > flags) > > > > - } > > > > - fputs("\n", fd); > > > > - } > > > > -+ if (TIFFFieldSet(tif, FIELD_NUMBEROFINKS)) { > > > > -+ fprintf(fd, " NumberOfInks: %d\n", > > > > -+ td->td_numberofinks); > > > > -+ } > > > > - if (TIFFFieldSet(tif,FIELD_THRESHHOLDING)) { > > > > - fprintf(fd, " Thresholding: "); > > > > - switch (td->td_threshholding) { > > > > --- > > > > -2.34.1 > > > > - > > > > diff --git > > > > a/meta/recipes-multimedia/libtiff/files/0001-fix-the-FPE-in-tiffcrop-415-427-and-428.patch > > > > > > > > b/meta/recipes-multimedia/libtiff/files/0001-fix-the-FPE-in-tiffcrop-415-427-and-428.patch > > > > deleted file mode 100644 > > > > index c7c5f616ed..0000000000 > > > > --- > > > > a/meta/recipes-multimedia/libtiff/files/0001-fix-the-FPE-in-tiffcrop-415-427-and-428.patch > > > > +++ /dev/null > > > > @@ -1,184 +0,0 @@ > > > > -CVE: CVE-2022-2056 CVE-2022-2057 CVE-2022-2058 > > > > -Upstream-Status: Backport > > > > -Signed-off-by: Ross Burton <[email protected]> > > > > - > > > > -From 22a205da86ca2d038d0066e1d70752d117258fb4 Mon Sep 17 00:00:00 2001 > > > > -From: 4ugustus <[email protected]> > > > > -Date: Sat, 11 Jun 2022 09:31:43 +0000 > > > > -Subject: [PATCH] fix the FPE in tiffcrop (#415, #427, and #428) > > > > - > > > > ---- > > > > - libtiff/tif_aux.c | 9 +++++++ > > > > - libtiff/tiffiop.h | 1 + > > > > - tools/tiffcrop.c | 62 ++++++++++++++++++++++++++--------------------- > > > > - 3 files changed, 44 insertions(+), 28 deletions(-) > > > > - > > > > -diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c > > > > -index 140f26c7..5b88c8d0 100644 > > > > ---- a/libtiff/tif_aux.c > > > > -+++ b/libtiff/tif_aux.c > > > > -@@ -402,6 +402,15 @@ float _TIFFClampDoubleToFloat( double val ) > > > > - return (float)val; > > > > - } > > > > - > > > > -+uint32_t _TIFFClampDoubleToUInt32(double val) > > > > -+{ > > > > -+ if( val < 0 ) > > > > -+ return 0; > > > > -+ if( val > 0xFFFFFFFFU || val != val ) > > > > -+ return 0xFFFFFFFFU; > > > > -+ return (uint32_t)val; > > > > -+} > > > > -+ > > > > - int _TIFFSeekOK(TIFF* tif, toff_t off) > > > > - { > > > > - /* Huge offsets, especially -1 / UINT64_MAX, can cause issues */ > > > > -diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h > > > > -index e3af461d..4e8bdac2 100644 > > > > ---- a/libtiff/tiffiop.h > > > > -+++ b/libtiff/tiffiop.h > > > > -@@ -365,6 +365,7 @@ extern double _TIFFUInt64ToDouble(uint64_t); > > > > - extern float _TIFFUInt64ToFloat(uint64_t); > > > > - > > > > - extern float _TIFFClampDoubleToFloat(double); > > > > -+extern uint32_t _TIFFClampDoubleToUInt32(double); > > > > - > > > > - extern tmsize_t > > > > - _TIFFReadEncodedStripAndAllocBuffer(TIFF* tif, uint32_t strip, > > > > -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c > > > > -index 1f827b2b..90286a5e 100644 > > > > ---- a/tools/tiffcrop.c > > > > -+++ b/tools/tiffcrop.c > > > > -@@ -5268,17 +5268,17 @@ computeInputPixelOffsets(struct crop_mask > > > > *crop, struct image_data *image, > > > > - { > > > > - if ((crop->res_unit == RESUNIT_INCH) || (crop->res_unit == > > > > RESUNIT_CENTIMETER)) > > > > - { > > > > -- x1 = (uint32_t) (crop->corners[i].X1 * scale * xres); > > > > -- x2 = (uint32_t) (crop->corners[i].X2 * scale * xres); > > > > -- y1 = (uint32_t) (crop->corners[i].Y1 * scale * yres); > > > > -- y2 = (uint32_t) (crop->corners[i].Y2 * scale * yres); > > > > -+ x1 = _TIFFClampDoubleToUInt32(crop->corners[i].X1 * scale * > > > > xres); > > > > -+ x2 = _TIFFClampDoubleToUInt32(crop->corners[i].X2 * scale * > > > > xres); > > > > -+ y1 = _TIFFClampDoubleToUInt32(crop->corners[i].Y1 * scale * > > > > yres); > > > > -+ y2 = _TIFFClampDoubleToUInt32(crop->corners[i].Y2 * scale * > > > > yres); > > > > - } > > > > - else > > > > - { > > > > -- x1 = (uint32_t) (crop->corners[i].X1); > > > > -- x2 = (uint32_t) (crop->corners[i].X2); > > > > -- y1 = (uint32_t) (crop->corners[i].Y1); > > > > -- y2 = (uint32_t) (crop->corners[i].Y2); > > > > -+ x1 = _TIFFClampDoubleToUInt32(crop->corners[i].X1); > > > > -+ x2 = _TIFFClampDoubleToUInt32(crop->corners[i].X2); > > > > -+ y1 = _TIFFClampDoubleToUInt32(crop->corners[i].Y1); > > > > -+ y2 = _TIFFClampDoubleToUInt32(crop->corners[i].Y2); > > > > - } > > > > - /* a) Region needs to be within image sizes 0.. width-1; > > > > 0..length-1 > > > > - * b) Corners are expected to be submitted as top-left to > > > > bottom-right. > > > > -@@ -5357,17 +5357,17 @@ computeInputPixelOffsets(struct crop_mask > > > > *crop, struct image_data *image, > > > > - { > > > > - if (crop->res_unit != RESUNIT_INCH && crop->res_unit != > > > > RESUNIT_CENTIMETER) > > > > - { /* User has specified pixels as reference unit */ > > > > -- tmargin = (uint32_t)(crop->margins[0]); > > > > -- lmargin = (uint32_t)(crop->margins[1]); > > > > -- bmargin = (uint32_t)(crop->margins[2]); > > > > -- rmargin = (uint32_t)(crop->margins[3]); > > > > -+ tmargin = _TIFFClampDoubleToUInt32(crop->margins[0]); > > > > -+ lmargin = _TIFFClampDoubleToUInt32(crop->margins[1]); > > > > -+ bmargin = _TIFFClampDoubleToUInt32(crop->margins[2]); > > > > -+ rmargin = _TIFFClampDoubleToUInt32(crop->margins[3]); > > > > - } > > > > - else > > > > - { /* inches or centimeters specified */ > > > > -- tmargin = (uint32_t)(crop->margins[0] * scale * yres); > > > > -- lmargin = (uint32_t)(crop->margins[1] * scale * xres); > > > > -- bmargin = (uint32_t)(crop->margins[2] * scale * yres); > > > > -- rmargin = (uint32_t)(crop->margins[3] * scale * xres); > > > > -+ tmargin = _TIFFClampDoubleToUInt32(crop->margins[0] * scale * > > > > yres); > > > > -+ lmargin = _TIFFClampDoubleToUInt32(crop->margins[1] * scale * > > > > xres); > > > > -+ bmargin = _TIFFClampDoubleToUInt32(crop->margins[2] * scale * > > > > yres); > > > > -+ rmargin = _TIFFClampDoubleToUInt32(crop->margins[3] * scale * > > > > xres); > > > > - } > > > > - > > > > - if ((lmargin + rmargin) > image->width) > > > > -@@ -5397,24 +5397,24 @@ computeInputPixelOffsets(struct crop_mask > > > > *crop, struct image_data *image, > > > > - if (crop->res_unit != RESUNIT_INCH && crop->res_unit != > > > > RESUNIT_CENTIMETER) > > > > - { > > > > - if (crop->crop_mode & CROP_WIDTH) > > > > -- width = (uint32_t)crop->width; > > > > -+ width = _TIFFClampDoubleToUInt32(crop->width); > > > > - else > > > > - width = image->width - lmargin - rmargin; > > > > - > > > > - if (crop->crop_mode & CROP_LENGTH) > > > > -- length = (uint32_t)crop->length; > > > > -+ length = _TIFFClampDoubleToUInt32(crop->length); > > > > - else > > > > - length = image->length - tmargin - bmargin; > > > > - } > > > > - else > > > > - { > > > > - if (crop->crop_mode & CROP_WIDTH) > > > > -- width = (uint32_t)(crop->width * scale * image->xres); > > > > -+ width = _TIFFClampDoubleToUInt32(crop->width * scale * > > > > image->xres); > > > > - else > > > > - width = image->width - lmargin - rmargin; > > > > - > > > > - if (crop->crop_mode & CROP_LENGTH) > > > > -- length = (uint32_t)(crop->length * scale * image->yres); > > > > -+ length = _TIFFClampDoubleToUInt32(crop->length * scale * > > > > image->yres); > > > > - else > > > > - length = image->length - tmargin - bmargin; > > > > - } > > > > -@@ -5868,13 +5868,13 @@ computeOutputPixelOffsets (struct crop_mask > > > > *crop, struct image_data *image, > > > > - { > > > > - if (page->res_unit == RESUNIT_INCH || page->res_unit == > > > > RESUNIT_CENTIMETER) > > > > - { /* inches or centimeters specified */ > > > > -- hmargin = (uint32_t)(page->hmargin * scale * page->hres * > > > > ((image->bps + 7) / 8)); > > > > -- vmargin = (uint32_t)(page->vmargin * scale * page->vres * > > > > ((image->bps + 7) / 8)); > > > > -+ hmargin = _TIFFClampDoubleToUInt32(page->hmargin * scale * > > > > page->hres * ((image->bps + 7) / 8)); > > > > -+ vmargin = _TIFFClampDoubleToUInt32(page->vmargin * scale * > > > > page->vres * ((image->bps + 7) / 8)); > > > > - } > > > > - else > > > > - { /* Otherwise user has specified pixels as reference unit */ > > > > -- hmargin = (uint32_t)(page->hmargin * scale * ((image->bps + 7) > > > > / 8)); > > > > -- vmargin = (uint32_t)(page->vmargin * scale * ((image->bps + 7) > > > > / 8)); > > > > -+ hmargin = _TIFFClampDoubleToUInt32(page->hmargin * scale * > > > > ((image->bps + 7) / 8)); > > > > -+ vmargin = _TIFFClampDoubleToUInt32(page->vmargin * scale * > > > > ((image->bps + 7) / 8)); > > > > - } > > > > - > > > > - if ((hmargin * 2.0) > (pwidth * page->hres)) > > > > -@@ -5912,13 +5912,13 @@ computeOutputPixelOffsets (struct crop_mask > > > > *crop, struct image_data *image, > > > > - { > > > > - if (page->mode & PAGE_MODE_PAPERSIZE ) > > > > - { > > > > -- owidth = (uint32_t)((pwidth * page->hres) - (hmargin * 2)); > > > > -- olength = (uint32_t)((plength * page->vres) - (vmargin * 2)); > > > > -+ owidth = _TIFFClampDoubleToUInt32((pwidth * page->hres) - > > > > (hmargin * 2)); > > > > -+ olength = _TIFFClampDoubleToUInt32((plength * page->vres) - > > > > (vmargin * 2)); > > > > - } > > > > - else > > > > - { > > > > -- owidth = (uint32_t)(iwidth - (hmargin * 2 * page->hres)); > > > > -- olength = (uint32_t)(ilength - (vmargin * 2 * page->vres)); > > > > -+ owidth = _TIFFClampDoubleToUInt32(iwidth - (hmargin * 2 * > > > > page->hres)); > > > > -+ olength = _TIFFClampDoubleToUInt32(ilength - (vmargin * 2 * > > > > page->vres)); > > > > - } > > > > - } > > > > - > > > > -@@ -5927,6 +5927,12 @@ computeOutputPixelOffsets (struct crop_mask > > > > *crop, struct image_data *image, > > > > - if (olength > ilength) > > > > - olength = ilength; > > > > - > > > > -+ if (owidth == 0 || olength == 0) > > > > -+ { > > > > -+ TIFFError("computeOutputPixelOffsets", "Integer overflow when > > > > calculating the number of pages"); > > > > -+ exit(EXIT_FAILURE); > > > > -+ } > > > > -+ > > > > - /* Compute the number of pages required for Portrait or Landscape */ > > > > - switch (page->orient) > > > > - { > > > > --- > > > > -2.34.1 > > > > - > > > > diff --git > > > > a/meta/recipes-multimedia/libtiff/files/0001-tiffcrop-S-option-Make-decision-simpler.patch > > > > > > > > b/meta/recipes-multimedia/libtiff/files/0001-tiffcrop-S-option-Make-decision-simpler.patch > > > > deleted file mode 100644 > > > > index 02642ecfbc..0000000000 > > > > --- > > > > a/meta/recipes-multimedia/libtiff/files/0001-tiffcrop-S-option-Make-decision-simpler.patch > > > > +++ /dev/null > > > > @@ -1,36 +0,0 @@ > > > > -Upstream-Status: Backport > > > > -Signed-off-by: Ross Burton <[email protected]> > > > > - > > > > -From bad48e90b410df32172006c7876da449ba62cdba Mon Sep 17 00:00:00 2001 > > > > -From: Su_Laus <[email protected]> > > > > -Date: Sat, 20 Aug 2022 23:35:26 +0200 > > > > -Subject: [PATCH] tiffcrop -S option: Make decision simpler. > > > > - > > > > ---- > > > > - tools/tiffcrop.c | 10 +++++----- > > > > - 1 file changed, 5 insertions(+), 5 deletions(-) > > > > - > > > > -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c > > > > -index c3b758ec..8fd856dc 100644 > > > > ---- a/tools/tiffcrop.c > > > > -+++ b/tools/tiffcrop.c > > > > -@@ -2133,11 +2133,11 @@ void process_command_opts (int argc, char > > > > *argv[], char *mp, char *mode, uint32 > > > > - } > > > > - /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z > > > > and -S are mutually exclusive) --*/ > > > > - char XY, Z, R, S; > > > > -- XY = ((crop_data->crop_mode & CROP_WIDTH) || > > > > (crop_data->crop_mode & CROP_LENGTH)); > > > > -- Z = (crop_data->crop_mode & CROP_ZONES); > > > > -- R = (crop_data->crop_mode & CROP_REGIONS); > > > > -- S = (page->mode & PAGE_MODE_ROWSCOLS); > > > > -- if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) > > > > || (R && S)) { > > > > -+ XY = ((crop_data->crop_mode & CROP_WIDTH) || > > > > (crop_data->crop_mode & CROP_LENGTH)) ? 1 : 0; > > > > -+ Z = (crop_data->crop_mode & CROP_ZONES) ? 1 : 0; > > > > -+ R = (crop_data->crop_mode & CROP_REGIONS) ? 1 : 0; > > > > -+ S = (page->mode & PAGE_MODE_ROWSCOLS) ? 1 : 0; > > > > -+ if (XY + Z + R + S > 1) { > > > > - TIFFError("tiffcrop input error", "The crop options(-X|-Y), > > > > -Z, -z and -S are mutually exclusive.->Exit"); > > > > - exit(EXIT_FAILURE); > > > > - } > > > > --- > > > > -2.34.1 > > > > - > > > > diff --git > > > > a/meta/recipes-multimedia/libtiff/files/0001-tiffcrop-disable-incompatibility-of-Z-X-Y-z-options-.patch > > > > > > > > b/meta/recipes-multimedia/libtiff/files/0001-tiffcrop-disable-incompatibility-of-Z-X-Y-z-options-.patch > > > > deleted file mode 100644 > > > > index 3e33f4adea..0000000000 > > > > --- > > > > a/meta/recipes-multimedia/libtiff/files/0001-tiffcrop-disable-incompatibility-of-Z-X-Y-z-options-.patch > > > > +++ /dev/null > > > > @@ -1,59 +0,0 @@ > > > > -CVE: CVE-2022-3597 CVE-2022-3626 CVE-2022-3627 > > > > -Upstream-Status: Backport > > > > -Signed-off-by: Ross Burton <[email protected]> > > > > - > > > > -From 4746f16253b784287bc8a5003990c1c3b9a03a62 Mon Sep 17 00:00:00 2001 > > > > -From: Su_Laus <[email protected]> > > > > -Date: Thu, 25 Aug 2022 16:11:41 +0200 > > > > -Subject: [PATCH] tiffcrop: disable incompatibility of -Z, -X, -Y, -z > > > > options > > > > - with any PAGE_MODE_x option (fixes #411 and #413) > > > > -MIME-Version: 1.0 > > > > -Content-Type: text/plain; charset=UTF-8 > > > > -Content-Transfer-Encoding: 8bit > > > > - > > > > -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. > > > > - > > > > -Code analysis: > > > > - > > > > -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[]. > > > > -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) . > > > > - > > > > -Execution of the else-clause often leads to buffer-overflows. > > > > - > > > > -Therefore, the above option combination is not supported and will be > > > > disabled to prevent those buffer-overflows. > > > > - > > > > -The MR solves issues #411 and #413. > > > > ---- > > > > - doc/tools/tiffcrop.rst | 8 ++++++++ > > > > - tools/tiffcrop.c | 32 +++++++++++++++++++++++++------- > > > > - 2 files changed, 33 insertions(+), 7 deletions(-) > > > > - > > > > -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c > > > > -index 8fd856dc..41a2ea36 100644 > > > > ---- a/tools/tiffcrop.c > > > > -+++ b/tools/tiffcrop.c > > > > -@@ -2138,9 +2143,20 @@ void process_command_opts (int argc, char > > > > *argv[], char *mp, char *mode, uint32 > > > > - R = (crop_data->crop_mode & CROP_REGIONS) ? 1 : 0; > > > > - S = (page->mode & PAGE_MODE_ROWSCOLS) ? 1 : 0; > > > > - if (XY + Z + R + S > 1) { > > > > -- TIFFError("tiffcrop input error", "The crop options(-X|-Y), > > > > -Z, -z and -S are mutually exclusive.->Exit"); > > > > -+ TIFFError("tiffcrop input error", "The crop options(-X|-Y), > > > > -Z, -z and -S are mutually exclusive.->exit"); > > > > - exit(EXIT_FAILURE); > > > > - } > > > > -+ > > > > -+ /* Check for not allowed combination: > > > > -+ * Any of the -X, -Y, -Z and -z options together with other > > > > PAGE_MODE_x options > > > > -+ * such as -H, -V, -P, -J or -K are not supported and may cause > > > > buffer overflows. > > > > -+. */ > > > > -+ if ((XY + Z + R > 0) && page->mode != PAGE_MODE_NONE) { > > > > -+ TIFFError("tiffcrop input error", > > > > -+ "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"); > > > > -+ exit(EXIT_FAILURE); > > > > -+ } > > > > -+ > > > > - } /* end process_command_opts */ > > > > - > > > > - /* Start a new output file if one has not been previously opened or > > > > --- > > > > -2.34.1 > > > > - > > > > diff --git > > > > a/meta/recipes-multimedia/libtiff/files/0001-tiffcrop-subroutines-require-a-larger-buffer-fixes-2.patch > > > > > > > > b/meta/recipes-multimedia/libtiff/files/0001-tiffcrop-subroutines-require-a-larger-buffer-fixes-2.patch > > > > deleted file mode 100644 > > > > index e44b9bc57c..0000000000 > > > > --- > > > > a/meta/recipes-multimedia/libtiff/files/0001-tiffcrop-subroutines-require-a-larger-buffer-fixes-2.patch > > > > +++ /dev/null > > > > @@ -1,653 +0,0 @@ > > > > -CVE: CVE-2022-3570 CVE-2022-3598 > > > > -Upstream-Status: Backport > > > > -Signed-off-by: Ross Burton <[email protected]> > > > > - > > > > -From afd7086090dafd3949afd172822cbcec4ed17d56 Mon Sep 17 00:00:00 2001 > > > > -From: Su Laus <[email protected]> > > > > -Date: Thu, 13 Oct 2022 14:33:27 +0000 > > > > -Subject: [PATCH] tiffcrop subroutines require a larger buffer (fixes > > > > #271, > > > > - #381, #386, #388, #389, #435) > > > > - > > > > ---- > > > > - tools/tiffcrop.c | 209 ++++++++++++++++++++++++++--------------------- > > > > - 1 file changed, 118 insertions(+), 91 deletions(-) > > > > - > > > > -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c > > > > -index 41a2ea36..deab5feb 100644 > > > > ---- a/tools/tiffcrop.c > > > > -+++ b/tools/tiffcrop.c > > > > -@@ -212,6 +212,10 @@ static char tiffcrop_rev_date[] = "26-08-2022"; > > > > - > > > > - #define TIFF_DIR_MAX 65534 > > > > - > > > > -+/* Some conversion subroutines require image buffers, which are at > > > > least 3 bytes > > > > -+ * larger than the necessary size for the image itself. */ > > > > -+#define NUM_BUFF_OVERSIZE_BYTES 3 > > > > -+ > > > > - /* Offsets into buffer for margins and fixed width and length > > > > segments */ > > > > - struct offset { > > > > - uint32_t tmargin; > > > > -@@ -233,7 +237,7 @@ struct offset { > > > > - */ > > > > - > > > > - struct buffinfo { > > > > -- uint32_t size; /* size of this buffer */ > > > > -+ size_t size; /* size of this buffer */ > > > > - unsigned char *buffer; /* address of the allocated buffer */ > > > > - }; > > > > - > > > > -@@ -810,8 +814,8 @@ static int readContigTilesIntoBuffer (TIFF* in, > > > > uint8_t* buf, > > > > - uint32_t dst_rowsize, shift_width; > > > > - uint32_t bytes_per_sample, bytes_per_pixel; > > > > - uint32_t trailing_bits, prev_trailing_bits; > > > > -- uint32_t tile_rowsize = TIFFTileRowSize(in); > > > > -- uint32_t src_offset, dst_offset; > > > > -+ tmsize_t tile_rowsize = TIFFTileRowSize(in); > > > > -+ tmsize_t src_offset, dst_offset; > > > > - uint32_t row_offset, col_offset; > > > > - uint8_t *bufp = (uint8_t*) buf; > > > > - unsigned char *src = NULL; > > > > -@@ -861,7 +865,7 @@ static int readContigTilesIntoBuffer (TIFF* in, > > > > uint8_t* buf, > > > > - TIFFError("readContigTilesIntoBuffer", "Integer overflow when > > > > calculating buffer size."); > > > > - exit(EXIT_FAILURE); > > > > - } > > > > -- tilebuf = limitMalloc(tile_buffsize + 3); > > > > -+ tilebuf = limitMalloc(tile_buffsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - if (tilebuf == 0) > > > > - return 0; > > > > - tilebuf[tile_buffsize] = 0; > > > > -@@ -1024,7 +1028,7 @@ static int readSeparateTilesIntoBuffer (TIFF* > > > > in, uint8_t *obuf, > > > > - for (sample = 0; (sample < spp) && (sample < MAX_SAMPLES); sample++) > > > > - { > > > > - srcbuffs[sample] = NULL; > > > > -- tbuff = (unsigned char *)limitMalloc(tilesize + 8); > > > > -+ tbuff = (unsigned char *)limitMalloc(tilesize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - if (!tbuff) > > > > - { > > > > - TIFFError ("readSeparateTilesIntoBuffer", > > > > -@@ -1217,7 +1221,8 @@ writeBufferToSeparateStrips (TIFF* out, uint8_t* > > > > buf, > > > > - } > > > > - rowstripsize = rowsperstrip * bytes_per_sample * (width + 1); > > > > - > > > > -- obuf = limitMalloc (rowstripsize); > > > > -+ /* Add 3 padding bytes for extractContigSamples32bits */ > > > > -+ obuf = limitMalloc (rowstripsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - if (obuf == NULL) > > > > - return 1; > > > > - > > > > -@@ -1229,7 +1234,7 @@ writeBufferToSeparateStrips (TIFF* out, uint8_t* > > > > buf, > > > > - > > > > - stripsize = TIFFVStripSize(out, nrows); > > > > - src = buf + (row * rowsize); > > > > -- memset (obuf, '\0', rowstripsize); > > > > -+ memset (obuf, '\0',rowstripsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - if (extractContigSamplesToBuffer(obuf, src, nrows, width, s, > > > > spp, bps, dump)) > > > > - { > > > > - _TIFFfree(obuf); > > > > -@@ -1237,10 +1242,15 @@ writeBufferToSeparateStrips (TIFF* out, > > > > uint8_t* buf, > > > > - } > > > > - if ((dump->outfile != NULL) && (dump->level == 1)) > > > > - { > > > > -- dump_info(dump->outfile, dump->format,"", > > > > -+ if (scanlinesize > 0x0ffffffffULL) { > > > > -+ dump_info(dump->infile, dump->format, "loadImage", > > > > -+ "Attention: scanlinesize %"PRIu64" is larger than > > > > UINT32_MAX.\nFollowing dump might be wrong.", > > > > -+ scanlinesize); > > > > -+ } > > > > -+ dump_info(dump->outfile, dump->format,"", > > > > - "Sample %2d, Strip: %2d, bytes: %4d, Row %4d, > > > > bytes: %4d, Input offset: %6d", > > > > -- s + 1, strip + 1, stripsize, row + 1, scanlinesize, > > > > src - buf); > > > > -- dump_buffer(dump->outfile, dump->format, nrows, scanlinesize, > > > > row, obuf); > > > > -+ s + 1, strip + 1, stripsize, row + 1, > > > > (uint32_t)scanlinesize, src - buf); > > > > -+ dump_buffer(dump->outfile, dump->format, nrows, > > > > (uint32_t)scanlinesize, row, obuf); > > > > - } > > > > - > > > > - if (TIFFWriteEncodedStrip(out, strip++, obuf, stripsize) < 0) > > > > -@@ -1267,7 +1277,7 @@ static int writeBufferToContigTiles (TIFF* out, > > > > uint8_t* buf, uint32_t imageleng > > > > - uint32_t tl, tw; > > > > - uint32_t row, col, nrow, ncol; > > > > - uint32_t src_rowsize, col_offset; > > > > -- uint32_t tile_rowsize = TIFFTileRowSize(out); > > > > -+ tmsize_t tile_rowsize = TIFFTileRowSize(out); > > > > - uint8_t* bufp = (uint8_t*) buf; > > > > - tsize_t tile_buffsize = 0; > > > > - tsize_t tilesize = TIFFTileSize(out); > > > > -@@ -1310,9 +1320,11 @@ static int writeBufferToContigTiles (TIFF* out, > > > > uint8_t* buf, uint32_t imageleng > > > > - } > > > > - src_rowsize = ((imagewidth * spp * bps) + 7U) / 8; > > > > - > > > > -- tilebuf = limitMalloc(tile_buffsize); > > > > -+ /* Add 3 padding bytes for extractContigSamples32bits */ > > > > -+ tilebuf = limitMalloc(tile_buffsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - if (tilebuf == 0) > > > > - return 1; > > > > -+ memset(tilebuf, 0, tile_buffsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - for (row = 0; row < imagelength; row += tl) > > > > - { > > > > - nrow = (row + tl > imagelength) ? imagelength - row : tl; > > > > -@@ -1358,7 +1370,8 @@ static int writeBufferToSeparateTiles (TIFF* > > > > out, uint8_t* buf, uint32_t imagele > > > > - uint32_t imagewidth, tsample_t > > > > spp, > > > > - struct dump_opts * dump) > > > > - { > > > > -- tdata_t obuf = limitMalloc(TIFFTileSize(out)); > > > > -+ /* Add 3 padding bytes for extractContigSamples32bits */ > > > > -+ tdata_t obuf = limitMalloc(TIFFTileSize(out) + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - uint32_t tl, tw; > > > > - uint32_t row, col, nrow, ncol; > > > > - uint32_t src_rowsize, col_offset; > > > > -@@ -1368,6 +1381,7 @@ static int writeBufferToSeparateTiles (TIFF* > > > > out, uint8_t* buf, uint32_t imagele > > > > - > > > > - if (obuf == NULL) > > > > - return 1; > > > > -+ memset(obuf, 0, TIFFTileSize(out) + NUM_BUFF_OVERSIZE_BYTES); > > > > - > > > > - if( !TIFFGetField(out, TIFFTAG_TILELENGTH, &tl) || > > > > - !TIFFGetField(out, TIFFTAG_TILEWIDTH, &tw) || > > > > -@@ -1793,14 +1807,14 @@ void process_command_opts (int argc, char > > > > *argv[], char *mp, char *mode, uint32 > > > > - > > > > - *opt_offset = '\0'; > > > > - /* convert option to lowercase */ > > > > -- end = strlen (opt_ptr); > > > > -+ end = (unsigned int)strlen (opt_ptr); > > > > - for (i = 0; i < end; i++) > > > > - *(opt_ptr + i) = tolower((int) *(opt_ptr + i)); > > > > - /* Look for dump format specification */ > > > > - if (strncmp(opt_ptr, "for", 3) == 0) > > > > - { > > > > - /* convert value to lowercase */ > > > > -- end = strlen (opt_offset + 1); > > > > -+ end = (unsigned int)strlen (opt_offset + 1); > > > > - for (i = 1; i <= end; i++) > > > > - *(opt_offset + i) = tolower((int) > > > > *(opt_offset + i)); > > > > - /* check dump format value */ > > > > -@@ -2273,6 +2287,8 @@ main(int argc, char* argv[]) > > > > - size_t length; > > > > - char temp_filename[PATH_MAX + 16]; /* Extra space keeps the > > > > compiler from complaining */ > > > > - > > > > -+ assert(NUM_BUFF_OVERSIZE_BYTES >= 3); > > > > -+ > > > > - little_endian = *((unsigned char *)&little_endian) & '1'; > > > > - > > > > - initImageData(&image); > > > > -@@ -3227,13 +3243,13 @@ extractContigSamples32bits (uint8_t *in, > > > > uint8_t *out, uint32_t cols, > > > > - /* If we have a full buffer's worth, write it out */ > > > > - if (ready_bits >= 32) > > > > - { > > > > -- bytebuff1 = (buff2 >> 56); > > > > -+ bytebuff1 = (uint8_t)(buff2 >> 56); > > > > - *dst++ = bytebuff1; > > > > -- bytebuff2 = (buff2 >> 48); > > > > -+ bytebuff2 = (uint8_t)(buff2 >> 48); > > > > - *dst++ = bytebuff2; > > > > -- bytebuff3 = (buff2 >> 40); > > > > -+ bytebuff3 = (uint8_t)(buff2 >> 40); > > > > - *dst++ = bytebuff3; > > > > -- bytebuff4 = (buff2 >> 32); > > > > -+ bytebuff4 = (uint8_t)(buff2 >> 32); > > > > - *dst++ = bytebuff4; > > > > - ready_bits -= 32; > > > > - > > > > -@@ -3642,13 +3658,13 @@ extractContigSamplesShifted32bits (uint8_t > > > > *in, uint8_t *out, uint32_t cols, > > > > - } > > > > - else /* If we have a full buffer's worth, write it out */ > > > > - { > > > > -- bytebuff1 = (buff2 >> 56); > > > > -+ bytebuff1 = (uint8_t)(buff2 >> 56); > > > > - *dst++ = bytebuff1; > > > > -- bytebuff2 = (buff2 >> 48); > > > > -+ bytebuff2 = (uint8_t)(buff2 >> 48); > > > > - *dst++ = bytebuff2; > > > > -- bytebuff3 = (buff2 >> 40); > > > > -+ bytebuff3 = (uint8_t)(buff2 >> 40); > > > > - *dst++ = bytebuff3; > > > > -- bytebuff4 = (buff2 >> 32); > > > > -+ bytebuff4 = (uint8_t)(buff2 >> 32); > > > > - *dst++ = bytebuff4; > > > > - ready_bits -= 32; > > > > - > > > > -@@ -3825,10 +3841,10 @@ extractContigSamplesToTileBuffer(uint8_t *out, > > > > uint8_t *in, uint32_t rows, uint3 > > > > - static int readContigStripsIntoBuffer (TIFF* in, uint8_t* buf) > > > > - { > > > > - uint8_t* bufp = buf; > > > > -- int32_t bytes_read = 0; > > > > -+ tmsize_t bytes_read = 0; > > > > - uint32_t strip, nstrips = TIFFNumberOfStrips(in); > > > > -- uint32_t stripsize = TIFFStripSize(in); > > > > -- uint32_t rows = 0; > > > > -+ tmsize_t stripsize = TIFFStripSize(in); > > > > -+ tmsize_t rows = 0; > > > > - uint32_t rps = TIFFGetFieldDefaulted(in, > > > > TIFFTAG_ROWSPERSTRIP, &rps); > > > > - tsize_t scanline_size = TIFFScanlineSize(in); > > > > - > > > > -@@ -3841,11 +3857,11 @@ static int readContigStripsIntoBuffer (TIFF* > > > > in, uint8_t* buf) > > > > - bytes_read = TIFFReadEncodedStrip (in, strip, bufp, > > > > -1); > > > > - rows = bytes_read / scanline_size; > > > > - if ((strip < (nstrips - 1)) && (bytes_read != > > > > (int32_t)stripsize)) > > > > -- TIFFError("", "Strip %"PRIu32": read > > > > %"PRId32" bytes, strip size %"PRIu32, > > > > -+ TIFFError("", "Strip %"PRIu32": read > > > > %"PRId64" bytes, strip size %"PRIu64, > > > > - strip + 1, bytes_read, stripsize); > > > > - > > > > - if (bytes_read < 0 && !ignore) { > > > > -- TIFFError("", "Error reading strip %"PRIu32" > > > > after %"PRIu32" rows", > > > > -+ TIFFError("", "Error reading strip %"PRIu32" > > > > after %"PRIu64" rows", > > > > - strip, rows); > > > > - return 0; > > > > - } > > > > -@@ -4310,13 +4326,13 @@ combineSeparateSamples32bits (uint8_t *in[], > > > > uint8_t *out, uint32_t cols, > > > > - /* If we have a full buffer's worth, write it out */ > > > > - if (ready_bits >= 32) > > > > - { > > > > -- bytebuff1 = (buff2 >> 56); > > > > -+ bytebuff1 = (uint8_t)(buff2 >> 56); > > > > - *dst++ = bytebuff1; > > > > -- bytebuff2 = (buff2 >> 48); > > > > -+ bytebuff2 = (uint8_t)(buff2 >> 48); > > > > - *dst++ = bytebuff2; > > > > -- bytebuff3 = (buff2 >> 40); > > > > -+ bytebuff3 = (uint8_t)(buff2 >> 40); > > > > - *dst++ = bytebuff3; > > > > -- bytebuff4 = (buff2 >> 32); > > > > -+ bytebuff4 = (uint8_t)(buff2 >> 32); > > > > - *dst++ = bytebuff4; > > > > - ready_bits -= 32; > > > > - > > > > -@@ -4359,10 +4375,10 @@ combineSeparateSamples32bits (uint8_t *in[], > > > > uint8_t *out, uint32_t cols, > > > > - "Row %3d, Col %3d, Src byte offset %3d bit offset %2d > > > > Dst offset %3d", > > > > - row + 1, col + 1, src_byte, src_bit, dst - out); > > > > - > > > > -- dump_long (dumpfile, format, "Match bits ", matchbits); > > > > -+ dump_wide (dumpfile, format, "Match bits ", matchbits); > > > > - dump_data (dumpfile, format, "Src bits ", src, 4); > > > > -- dump_long (dumpfile, format, "Buff1 bits ", buff1); > > > > -- dump_long (dumpfile, format, "Buff2 bits ", buff2); > > > > -+ dump_wide (dumpfile, format, "Buff1 bits ", buff1); > > > > -+ dump_wide (dumpfile, format, "Buff2 bits ", buff2); > > > > - dump_byte (dumpfile, format, "Write bits1", bytebuff1); > > > > - dump_byte (dumpfile, format, "Write bits2", bytebuff2); > > > > - dump_info (dumpfile, format, "", "Ready bits: %2d", > > > > ready_bits); > > > > -@@ -4835,13 +4851,13 @@ combineSeparateTileSamples32bits (uint8_t > > > > *in[], uint8_t *out, uint32_t cols, > > > > - /* If we have a full buffer's worth, write it out */ > > > > - if (ready_bits >= 32) > > > > - { > > > > -- bytebuff1 = (buff2 >> 56); > > > > -+ bytebuff1 = (uint8_t)(buff2 >> 56); > > > > - *dst++ = bytebuff1; > > > > -- bytebuff2 = (buff2 >> 48); > > > > -+ bytebuff2 = (uint8_t)(buff2 >> 48); > > > > - *dst++ = bytebuff2; > > > > -- bytebuff3 = (buff2 >> 40); > > > > -+ bytebuff3 = (uint8_t)(buff2 >> 40); > > > > - *dst++ = bytebuff3; > > > > -- bytebuff4 = (buff2 >> 32); > > > > -+ bytebuff4 = (uint8_t)(buff2 >> 32); > > > > - *dst++ = bytebuff4; > > > > - ready_bits -= 32; > > > > - > > > > -@@ -4884,10 +4900,10 @@ combineSeparateTileSamples32bits (uint8_t > > > > *in[], uint8_t *out, uint32_t cols, > > > > - "Row %3d, Col %3d, Src byte offset %3d bit offset %2d > > > > Dst offset %3d", > > > > - row + 1, col + 1, src_byte, src_bit, dst - out); > > > > - > > > > -- dump_long (dumpfile, format, "Match bits ", matchbits); > > > > -+ dump_wide (dumpfile, format, "Match bits ", matchbits); > > > > - dump_data (dumpfile, format, "Src bits ", src, 4); > > > > -- dump_long (dumpfile, format, "Buff1 bits ", buff1); > > > > -- dump_long (dumpfile, format, "Buff2 bits ", buff2); > > > > -+ dump_wide (dumpfile, format, "Buff1 bits ", buff1); > > > > -+ dump_wide (dumpfile, format, "Buff2 bits ", buff2); > > > > - dump_byte (dumpfile, format, "Write bits1", bytebuff1); > > > > - dump_byte (dumpfile, format, "Write bits2", bytebuff2); > > > > - dump_info (dumpfile, format, "", "Ready bits: %2d", > > > > ready_bits); > > > > -@@ -4910,7 +4926,7 @@ static int readSeparateStripsIntoBuffer (TIFF > > > > *in, uint8_t *obuf, uint32_t lengt > > > > - { > > > > - int i, bytes_per_sample, bytes_per_pixel, shift_width, result = 1; > > > > - uint32_t j; > > > > -- int32_t bytes_read = 0; > > > > -+ tmsize_t bytes_read = 0; > > > > - uint16_t bps = 0, planar; > > > > - uint32_t nstrips; > > > > - uint32_t strips_per_sample; > > > > -@@ -4976,7 +4992,7 @@ static int readSeparateStripsIntoBuffer (TIFF > > > > *in, uint8_t *obuf, uint32_t lengt > > > > - for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++) > > > > - { > > > > - srcbuffs[s] = NULL; > > > > -- buff = limitMalloc(stripsize + 3); > > > > -+ buff = limitMalloc(stripsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - if (!buff) > > > > - { > > > > - TIFFError ("readSeparateStripsIntoBuffer", > > > > -@@ -4999,7 +5015,7 @@ static int readSeparateStripsIntoBuffer (TIFF > > > > *in, uint8_t *obuf, uint32_t lengt > > > > - buff = srcbuffs[s]; > > > > - strip = (s * strips_per_sample) + j; > > > > - bytes_read = TIFFReadEncodedStrip (in, strip, buff, stripsize); > > > > -- rows_this_strip = bytes_read / src_rowsize; > > > > -+ rows_this_strip = (uint32_t)(bytes_read / src_rowsize); > > > > - if (bytes_read < 0 && !ignore) > > > > - { > > > > - TIFFError(TIFFFileName(in), > > > > -@@ -6062,13 +6078,14 @@ loadImage(TIFF* in, struct image_data *image, > > > > struct dump_opts *dump, unsigned c > > > > - uint16_t input_compression = 0, input_photometric = 0; > > > > - uint16_t subsampling_horiz, subsampling_vert; > > > > - uint32_t width = 0, length = 0; > > > > -- uint32_t stsize = 0, tlsize = 0, buffsize = 0, scanlinesize = 0; > > > > -+ tmsize_t stsize = 0, tlsize = 0, buffsize = 0; > > > > -+ tmsize_t scanlinesize = 0; > > > > - uint32_t tw = 0, tl = 0; /* Tile width and length */ > > > > -- uint32_t tile_rowsize = 0; > > > > -+ tmsize_t tile_rowsize = 0; > > > > - unsigned char *read_buff = NULL; > > > > - unsigned char *new_buff = NULL; > > > > - int readunit = 0; > > > > -- static uint32_t prev_readsize = 0; > > > > -+ static tmsize_t prev_readsize = 0; > > > > - > > > > - TIFFGetFieldDefaulted(in, TIFFTAG_BITSPERSAMPLE, &bps); > > > > - TIFFGetFieldDefaulted(in, TIFFTAG_SAMPLESPERPIXEL, &spp); > > > > -@@ -6325,6 +6342,8 @@ loadImage(TIFF* in, struct image_data *image, > > > > struct dump_opts *dump, unsigned c > > > > - /* The buffsize_check and the possible adaptation of buffsize > > > > - * has to account also for padding of each line to a byte > > > > boundary. > > > > - * This is assumed by mirrorImage() and rotateImage(). > > > > -+ * Furthermore, functions like extractContigSamplesShifted32bits() > > > > -+ * need a buffer, which is at least 3 bytes larger than the > > > > actual image. > > > > - * Otherwise buffer-overflow might occur there. > > > > - */ > > > > - buffsize_check = length * (uint32_t)(((width * spp * bps) + 7) / > > > > 8); > > > > -@@ -6376,7 +6395,7 @@ loadImage(TIFF* in, struct image_data *image, > > > > struct dump_opts *dump, unsigned c > > > > - TIFFError("loadImage", "Unable to allocate/reallocate read > > > > buffer"); > > > > - return (-1); > > > > - } > > > > -- read_buff = (unsigned char *)limitMalloc(buffsize+3); > > > > -+ read_buff = (unsigned char *)limitMalloc(buffsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - } > > > > - else > > > > - { > > > > -@@ -6387,11 +6406,11 @@ loadImage(TIFF* in, struct image_data *image, > > > > struct dump_opts *dump, unsigned c > > > > - TIFFError("loadImage", "Unable to allocate/reallocate read > > > > buffer"); > > > > - return (-1); > > > > - } > > > > -- new_buff = _TIFFrealloc(read_buff, buffsize+3); > > > > -+ new_buff = _TIFFrealloc(read_buff, buffsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - if (!new_buff) > > > > - { > > > > - free (read_buff); > > > > -- read_buff = (unsigned char *)limitMalloc(buffsize+3); > > > > -+ read_buff = (unsigned char *)limitMalloc(buffsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - } > > > > - else > > > > - read_buff = new_buff; > > > > -@@ -6464,8 +6483,13 @@ loadImage(TIFF* in, struct image_data *image, > > > > struct dump_opts *dump, unsigned c > > > > - dump_info (dump->infile, dump->format, "", > > > > - "Bits per sample %"PRIu16", Samples per pixel > > > > %"PRIu16, bps, spp); > > > > - > > > > -+ if (scanlinesize > 0x0ffffffffULL) { > > > > -+ dump_info(dump->infile, dump->format, "loadImage", > > > > -+ "Attention: scanlinesize %"PRIu64" is larger than > > > > UINT32_MAX.\nFollowing dump might be wrong.", > > > > -+ scanlinesize); > > > > -+ } > > > > - for (i = 0; i < length; i++) > > > > -- dump_buffer(dump->infile, dump->format, 1, scanlinesize, > > > > -+ dump_buffer(dump->infile, dump->format, 1, > > > > (uint32_t)scanlinesize, > > > > - i, read_buff + (i * scanlinesize)); > > > > - } > > > > - return (0); > > > > -@@ -7485,13 +7509,13 @@ writeSingleSection(TIFF *in, TIFF *out, struct > > > > image_data *image, > > > > - if (TIFFGetField(in, TIFFTAG_NUMBEROFINKS, &ninks)) { > > > > - TIFFSetField(out, TIFFTAG_NUMBEROFINKS, ninks); > > > > - if (TIFFGetField(in, TIFFTAG_INKNAMES, &inknames)) { > > > > -- int inknameslen = strlen(inknames) + 1; > > > > -+ int inknameslen = (int)strlen(inknames) + 1; > > > > - const char* cp = inknames; > > > > - while (ninks > 1) { > > > > - cp = strchr(cp, '\0'); > > > > - if (cp) { > > > > - cp++; > > > > -- inknameslen += (strlen(cp) + 1); > > > > -+ inknameslen += ((int)strlen(cp) + 1); > > > > - } > > > > - ninks--; > > > > - } > > > > -@@ -7554,23 +7578,23 @@ createImageSection(uint32_t sectsize, unsigned > > > > char **sect_buff_ptr) > > > > - > > > > - if (!sect_buff) > > > > - { > > > > -- sect_buff = (unsigned char *)limitMalloc(sectsize); > > > > -+ sect_buff = (unsigned char *)limitMalloc(sectsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - if (!sect_buff) > > > > - { > > > > - TIFFError("createImageSection", "Unable to > > > > allocate/reallocate section buffer"); > > > > - return (-1); > > > > - } > > > > -- _TIFFmemset(sect_buff, 0, sectsize); > > > > -+ _TIFFmemset(sect_buff, 0, sectsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - } > > > > - else > > > > - { > > > > - if (prev_sectsize < sectsize) > > > > - { > > > > -- new_buff = _TIFFrealloc(sect_buff, sectsize); > > > > -+ new_buff = _TIFFrealloc(sect_buff, sectsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - if (!new_buff) > > > > - { > > > > - _TIFFfree (sect_buff); > > > > -- sect_buff = (unsigned char *)limitMalloc(sectsize); > > > > -+ sect_buff = (unsigned char *)limitMalloc(sectsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - } > > > > - else > > > > - sect_buff = new_buff; > > > > -@@ -7580,7 +7604,7 @@ createImageSection(uint32_t sectsize, unsigned > > > > char **sect_buff_ptr) > > > > - TIFFError("createImageSection", "Unable to > > > > allocate/reallocate section buffer"); > > > > - return (-1); > > > > - } > > > > -- _TIFFmemset(sect_buff, 0, sectsize); > > > > -+ _TIFFmemset(sect_buff, 0, sectsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - } > > > > - } > > > > - > > > > -@@ -7611,17 +7635,17 @@ processCropSelections(struct image_data > > > > *image, struct crop_mask *crop, > > > > - cropsize = crop->bufftotal; > > > > - crop_buff = seg_buffs[0].buffer; > > > > - if (!crop_buff) > > > > -- crop_buff = (unsigned char *)limitMalloc(cropsize); > > > > -+ crop_buff = (unsigned char *)limitMalloc(cropsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - else > > > > - { > > > > - prev_cropsize = seg_buffs[0].size; > > > > - if (prev_cropsize < cropsize) > > > > - { > > > > -- next_buff = _TIFFrealloc(crop_buff, cropsize); > > > > -+ next_buff = _TIFFrealloc(crop_buff, cropsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - if (! next_buff) > > > > - { > > > > - _TIFFfree (crop_buff); > > > > -- crop_buff = (unsigned char *)limitMalloc(cropsize); > > > > -+ crop_buff = (unsigned char *)limitMalloc(cropsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - } > > > > - else > > > > - crop_buff = next_buff; > > > > -@@ -7634,7 +7658,7 @@ processCropSelections(struct image_data *image, > > > > struct crop_mask *crop, > > > > - return (-1); > > > > - } > > > > - > > > > -- _TIFFmemset(crop_buff, 0, cropsize); > > > > -+ _TIFFmemset(crop_buff, 0, cropsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - seg_buffs[0].buffer = crop_buff; > > > > - seg_buffs[0].size = cropsize; > > > > - > > > > -@@ -7714,17 +7738,17 @@ processCropSelections(struct image_data > > > > *image, struct crop_mask *crop, > > > > - cropsize = crop->bufftotal; > > > > - crop_buff = seg_buffs[i].buffer; > > > > - if (!crop_buff) > > > > -- crop_buff = (unsigned char *)limitMalloc(cropsize); > > > > -+ crop_buff = (unsigned char *)limitMalloc(cropsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - else > > > > - { > > > > - prev_cropsize = seg_buffs[0].size; > > > > - if (prev_cropsize < cropsize) > > > > - { > > > > -- next_buff = _TIFFrealloc(crop_buff, cropsize); > > > > -+ next_buff = _TIFFrealloc(crop_buff, cropsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - if (! next_buff) > > > > - { > > > > - _TIFFfree (crop_buff); > > > > -- crop_buff = (unsigned char *)limitMalloc(cropsize); > > > > -+ crop_buff = (unsigned char *)limitMalloc(cropsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - } > > > > - else > > > > - crop_buff = next_buff; > > > > -@@ -7737,7 +7761,7 @@ processCropSelections(struct image_data *image, > > > > struct crop_mask *crop, > > > > - return (-1); > > > > - } > > > > - > > > > -- _TIFFmemset(crop_buff, 0, cropsize); > > > > -+ _TIFFmemset(crop_buff, 0, cropsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - seg_buffs[i].buffer = crop_buff; > > > > - seg_buffs[i].size = cropsize; > > > > - > > > > -@@ -7853,24 +7877,24 @@ createCroppedImage(struct image_data *image, > > > > struct crop_mask *crop, > > > > - crop_buff = *crop_buff_ptr; > > > > - if (!crop_buff) > > > > - { > > > > -- crop_buff = (unsigned char *)limitMalloc(cropsize); > > > > -+ crop_buff = (unsigned char *)limitMalloc(cropsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - if (!crop_buff) > > > > - { > > > > - TIFFError("createCroppedImage", "Unable to > > > > allocate/reallocate crop buffer"); > > > > - return (-1); > > > > - } > > > > -- _TIFFmemset(crop_buff, 0, cropsize); > > > > -+ _TIFFmemset(crop_buff, 0, cropsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - prev_cropsize = cropsize; > > > > - } > > > > - else > > > > - { > > > > - if (prev_cropsize < cropsize) > > > > - { > > > > -- new_buff = _TIFFrealloc(crop_buff, cropsize); > > > > -+ new_buff = _TIFFrealloc(crop_buff, cropsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - if (!new_buff) > > > > - { > > > > - free (crop_buff); > > > > -- crop_buff = (unsigned char *)limitMalloc(cropsize); > > > > -+ crop_buff = (unsigned char *)limitMalloc(cropsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - } > > > > - else > > > > - crop_buff = new_buff; > > > > -@@ -7879,7 +7903,7 @@ createCroppedImage(struct image_data *image, > > > > struct crop_mask *crop, > > > > - TIFFError("createCroppedImage", "Unable to > > > > allocate/reallocate crop buffer"); > > > > - return (-1); > > > > - } > > > > -- _TIFFmemset(crop_buff, 0, cropsize); > > > > -+ _TIFFmemset(crop_buff, 0, cropsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - } > > > > - } > > > > - > > > > -@@ -8177,13 +8201,13 @@ writeCroppedImage(TIFF *in, TIFF *out, struct > > > > image_data *image, > > > > - if (TIFFGetField(in, TIFFTAG_NUMBEROFINKS, &ninks)) { > > > > - TIFFSetField(out, TIFFTAG_NUMBEROFINKS, ninks); > > > > - if (TIFFGetField(in, TIFFTAG_INKNAMES, &inknames)) { > > > > -- int inknameslen = strlen(inknames) + 1; > > > > -+ int inknameslen = (int)strlen(inknames) + 1; > > > > - const char* cp = inknames; > > > > - while (ninks > 1) { > > > > - cp = strchr(cp, '\0'); > > > > - if (cp) { > > > > - cp++; > > > > -- inknameslen += (strlen(cp) + 1); > > > > -+ inknameslen += ((int)strlen(cp) + 1); > > > > - } > > > > - ninks--; > > > > - } > > > > -@@ -8568,13 +8592,13 @@ rotateContigSamples32bits(uint16_t rotation, > > > > uint16_t spp, uint16_t bps, uint32_ > > > > - } > > > > - else /* If we have a full buffer's worth, write it out */ > > > > - { > > > > -- bytebuff1 = (buff2 >> 56); > > > > -+ bytebuff1 = (uint8_t)(buff2 >> 56); > > > > - *dst++ = bytebuff1; > > > > -- bytebuff2 = (buff2 >> 48); > > > > -+ bytebuff2 = (uint8_t)(buff2 >> 48); > > > > - *dst++ = bytebuff2; > > > > -- bytebuff3 = (buff2 >> 40); > > > > -+ bytebuff3 = (uint8_t)(buff2 >> 40); > > > > - *dst++ = bytebuff3; > > > > -- bytebuff4 = (buff2 >> 32); > > > > -+ bytebuff4 = (uint8_t)(buff2 >> 32); > > > > - *dst++ = bytebuff4; > > > > - ready_bits -= 32; > > > > - > > > > -@@ -8643,12 +8667,13 @@ rotateImage(uint16_t rotation, struct > > > > image_data *image, uint32_t *img_width, > > > > - return (-1); > > > > - } > > > > - > > > > -- if (!(rbuff = (unsigned char *)limitMalloc(buffsize))) > > > > -+ /* Add 3 padding bytes for extractContigSamplesShifted32bits */ > > > > -+ if (!(rbuff = (unsigned char *)limitMalloc(buffsize + > > > > NUM_BUFF_OVERSIZE_BYTES))) > > > > - { > > > > -- TIFFError("rotateImage", "Unable to allocate rotation buffer of > > > > %1u bytes", buffsize); > > > > -+ TIFFError("rotateImage", "Unable to allocate rotation buffer of > > > > %1u bytes", buffsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - return (-1); > > > > - } > > > > -- _TIFFmemset(rbuff, '\0', buffsize); > > > > -+ _TIFFmemset(rbuff, '\0', buffsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - > > > > - ibuff = *ibuff_ptr; > > > > - switch (rotation) > > > > -@@ -9176,13 +9201,13 @@ reverseSamples32bits (uint16_t spp, uint16_t > > > > bps, uint32_t width, > > > > - } > > > > - else /* If we have a full buffer's worth, write it out */ > > > > - { > > > > -- bytebuff1 = (buff2 >> 56); > > > > -+ bytebuff1 = (uint8_t)(buff2 >> 56); > > > > - *dst++ = bytebuff1; > > > > -- bytebuff2 = (buff2 >> 48); > > > > -+ bytebuff2 = (uint8_t)(buff2 >> 48); > > > > - *dst++ = bytebuff2; > > > > -- bytebuff3 = (buff2 >> 40); > > > > -+ bytebuff3 = (uint8_t)(buff2 >> 40); > > > > - *dst++ = bytebuff3; > > > > -- bytebuff4 = (buff2 >> 32); > > > > -+ bytebuff4 = (uint8_t)(buff2 >> 32); > > > > - *dst++ = bytebuff4; > > > > - ready_bits -= 32; > > > > - > > > > -@@ -9273,12 +9298,13 @@ mirrorImage(uint16_t spp, uint16_t bps, > > > > uint16_t mirror, uint32_t width, uint32_ > > > > - { > > > > - case MIRROR_BOTH: > > > > - case MIRROR_VERT: > > > > -- line_buff = (unsigned char *)limitMalloc(rowsize); > > > > -+ line_buff = (unsigned char *)limitMalloc(rowsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - if (line_buff == NULL) > > > > - { > > > > -- TIFFError ("mirrorImage", "Unable to allocate mirror > > > > line buffer of %1u bytes", rowsize); > > > > -+ TIFFError ("mirrorImage", "Unable to allocate mirror > > > > line buffer of %1u bytes", rowsize + NUM_BUFF_OVERSIZE_BYTES); > > > > - return (-1); > > > > - } > > > > -+ _TIFFmemset(line_buff, '\0', rowsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - > > > > - dst = ibuff + (rowsize * (length - 1)); > > > > - for (row = 0; row < length / 2; row++) > > > > -@@ -9310,11 +9336,12 @@ mirrorImage(uint16_t spp, uint16_t bps, > > > > uint16_t mirror, uint32_t width, uint32_ > > > > - } > > > > - else > > > > - { /* non 8 bit per sample data */ > > > > -- if (!(line_buff = (unsigned char > > > > *)limitMalloc(rowsize + 1))) > > > > -+ if (!(line_buff = (unsigned char > > > > *)limitMalloc(rowsize + NUM_BUFF_OVERSIZE_BYTES))) > > > > - { > > > > - TIFFError("mirrorImage", "Unable to allocate mirror > > > > line buffer"); > > > > - return (-1); > > > > - } > > > > -+ _TIFFmemset(line_buff, '\0', rowsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - bytes_per_sample = (bps + 7) / 8; > > > > - bytes_per_pixel = ((bps * spp) + 7) / 8; > > > > - if (bytes_per_pixel < (bytes_per_sample + 1)) > > > > -@@ -9326,7 +9353,7 @@ mirrorImage(uint16_t spp, uint16_t bps, uint16_t > > > > mirror, uint32_t width, uint32_ > > > > - { > > > > - row_offset = row * rowsize; > > > > - src = ibuff + row_offset; > > > > -- _TIFFmemset (line_buff, '\0', rowsize); > > > > -+ _TIFFmemset (line_buff, '\0', rowsize + > > > > NUM_BUFF_OVERSIZE_BYTES); > > > > - switch (shift_width) > > > > - { > > > > - case 1: if (reverseSamples16bits(spp, bps, width, > > > > src, line_buff)) > > > > --- > > > > -2.34.1 > > > > - > > > > diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2022-2953.patch > > > > b/meta/recipes-multimedia/libtiff/files/CVE-2022-2953.patch > > > > deleted file mode 100644 > > > > index e673945fa3..0000000000 > > > > --- a/meta/recipes-multimedia/libtiff/files/CVE-2022-2953.patch > > > > +++ /dev/null > > > > @@ -1,86 +0,0 @@ > > > > -CVE: CVE-2022-2953 > > > > -Upstream-Status: Backport > > > > -Signed-off-by: Ross Burton <[email protected]> > > > > - > > > > -From 8fe3735942ea1d90d8cef843b55b3efe8ab6feaf Mon Sep 17 00:00:00 2001 > > > > -From: Su_Laus <[email protected]> > > > > -Date: Mon, 15 Aug 2022 22:11:03 +0200 > > > > -Subject: [PATCH] > > > > =?UTF-8?q?According=20to=20Richard=20Nolde=20https://gitl?= > > > > - > > > > =?UTF-8?q?ab.com/libtiff/libtiff/-/issues/401#note=5F877637400=20the=20ti?= > > > > - > > > > =?UTF-8?q?ffcrop=20option=20=E2=80=9E-S=E2=80=9C=20is=20also=20mutually?= > > > > - > > > > =?UTF-8?q?=20exclusive=20to=20the=20other=20crop=20options=20(-X|-Y),=20-?= > > > > - =?UTF-8?q?Z=20and=20-z.?= > > > > -MIME-Version: 1.0 > > > > -Content-Type: text/plain; charset=UTF-8 > > > > -Content-Transfer-Encoding: 8bit > > > > - > > > > -This is now checked and ends tiffcrop if those arguments are not > > > > mutually exclusive. > > > > - > > > > -This MR will fix the following tiffcrop issues: #349, #414, #422, > > > > #423, #424 > > > > ---- > > > > - tools/tiffcrop.c | 31 ++++++++++++++++--------------- > > > > - 1 file changed, 16 insertions(+), 15 deletions(-) > > > > - > > > > -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c > > > > -index 90286a5e..c3b758ec 100644 > > > > ---- a/tools/tiffcrop.c > > > > -+++ b/tools/tiffcrop.c > > > > -@@ -173,12 +173,12 @@ static char tiffcrop_rev_date[] = "02-09-2022"; > > > > - #define ROTATECW_270 32 > > > > - #define ROTATE_ANY (ROTATECW_90 | ROTATECW_180 | ROTATECW_270) > > > > - > > > > --#define CROP_NONE 0 > > > > --#define CROP_MARGINS 1 > > > > --#define CROP_WIDTH 2 > > > > --#define CROP_LENGTH 4 > > > > --#define CROP_ZONES 8 > > > > --#define CROP_REGIONS 16 > > > > -+#define CROP_NONE 0 /* "-S" -> Page_MODE_ROWSCOLS and > > > > page->rows/->cols != 0 */ > > > > -+#define CROP_MARGINS 1 /* "-m" */ > > > > -+#define CROP_WIDTH 2 /* "-X" */ > > > > -+#define CROP_LENGTH 4 /* "-Y" */ > > > > -+#define CROP_ZONES 8 /* "-Z" */ > > > > -+#define CROP_REGIONS 16 /* "-z" */ > > > > - #define CROP_ROTATE 32 > > > > - #define CROP_MIRROR 64 > > > > - #define CROP_INVERT 128 > > > > -@@ -316,7 +316,7 @@ struct crop_mask { > > > > - #define PAGE_MODE_RESOLUTION 1 > > > > - #define PAGE_MODE_PAPERSIZE 2 > > > > - #define PAGE_MODE_MARGINS 4 > > > > --#define PAGE_MODE_ROWSCOLS 8 > > > > -+#define PAGE_MODE_ROWSCOLS 8 /* for -S option */ > > > > - > > > > - #define INVERT_DATA_ONLY 10 > > > > - #define INVERT_DATA_AND_TAG 11 > > > > -@@ -781,7 +781,7 @@ static const char usage_info[] = > > > > - " The four debug/dump options are independent, though it > > > > makes little sense to\n" > > > > - " specify a dump file without specifying a detail > > > > level.\n" > > > > - "\n" > > > > --"Note: The (-X|-Y), -Z and -z options are mutually > > > > exclusive.\n" > > > > -+"Note: The (-X|-Y), -Z, -z and -S options are mutually > > > > exclusive.\n" > > > > - " In no case should the options be applied to a given > > > > selection successively.\n" > > > > - "\n" > > > > - ; > > > > -@@ -2131,13 +2131,14 @@ void process_command_opts (int argc, char > > > > *argv[], char *mp, char *mode, uint32 > > > > - /*NOTREACHED*/ > > > > - } > > > > - } > > > > -- /*-- Check for not allowed combinations (e.g. -X, -Y and -Z and > > > > -z are mutually exclusive) --*/ > > > > -- char XY, Z, R; > > > > -+ /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z > > > > and -S are mutually exclusive) --*/ > > > > -+ char XY, Z, R, S; > > > > - XY = ((crop_data->crop_mode & CROP_WIDTH) || > > > > (crop_data->crop_mode & CROP_LENGTH)); > > > > - Z = (crop_data->crop_mode & CROP_ZONES); > > > > - R = (crop_data->crop_mode & CROP_REGIONS); > > > > -- if ((XY && Z) || (XY && R) || (Z && R)) { > > > > -- TIFFError("tiffcrop input error", "The crop options(-X|-Y), > > > > -Z and -z are mutually exclusive.->Exit"); > > > > -+ S = (page->mode & PAGE_MODE_ROWSCOLS); > > > > -+ if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) > > > > || (R && S)) { > > > > -+ TIFFError("tiffcrop input error", "The crop options(-X|-Y), > > > > -Z, -z and -S are mutually exclusive.->Exit"); > > > > - exit(EXIT_FAILURE); > > > > - } > > > > - } /* end process_command_opts */ > > > > --- > > > > -2.34.1 > > > > - > > > > diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2022-34526.patch > > > > b/meta/recipes-multimedia/libtiff/files/CVE-2022-34526.patch > > > > deleted file mode 100644 > > > > index 54c3345746..0000000000 > > > > --- a/meta/recipes-multimedia/libtiff/files/CVE-2022-34526.patch > > > > +++ /dev/null > > > > @@ -1,32 +0,0 @@ > > > > -From 275735d0354e39c0ac1dc3c0db2120d6f31d1990 Mon Sep 17 00:00:00 2001 > > > > -From: Even Rouault <[email protected]> > > > > -Date: Mon, 27 Jun 2022 16:09:43 +0200 > > > > -Subject: [PATCH] _TIFFCheckFieldIsValidForCodec(): return FALSE when > > > > passed a > > > > - codec-specific tag and the codec is not configured (fixes #433) > > > > - > > > > -This avoids crashes when querying such tags > > > > - > > > > -CVE: CVE-2022-34526 > > > > -Upstream-Status: Backport > > > > [https://gitlab.com/libtiff/libtiff/-/commit/275735d0354e39c0ac1dc3c0db2120d6f31d1990] > > > > -Signed-off-by: Khem Raj <[email protected]> > > > > ---- > > > > - libtiff/tif_dirinfo.c | 3 +++ > > > > - 1 file changed, 3 insertions(+) > > > > - > > > > -diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c > > > > -index c30f569b..3371cb5c 100644 > > > > ---- a/libtiff/tif_dirinfo.c > > > > -+++ b/libtiff/tif_dirinfo.c > > > > -@@ -1191,6 +1191,9 @@ _TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t > > > > tag) > > > > - default: > > > > - return 1; > > > > - } > > > > -+ if( !TIFFIsCODECConfigured(tif->tif_dir.td_compression) ) { > > > > -+ return 0; > > > > -+ } > > > > - /* Check if codec specific tags are allowed for the current > > > > - * compression scheme (codec) */ > > > > - switch (tif->tif_dir.td_compression) { > > > > --- > > > > -GitLab > > > > - > > > > diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2022-3970.patch > > > > b/meta/recipes-multimedia/libtiff/files/CVE-2022-3970.patch > > > > deleted file mode 100644 > > > > index b3352ba8ab..0000000000 > > > > --- a/meta/recipes-multimedia/libtiff/files/CVE-2022-3970.patch > > > > +++ /dev/null > > > > @@ -1,39 +0,0 @@ > > > > -From 227500897dfb07fb7d27f7aa570050e62617e3be Mon Sep 17 00:00:00 2001 > > > > -From: Even Rouault <[email protected]> > > > > -Date: Tue, 8 Nov 2022 15:16:58 +0100 > > > > -Subject: [PATCH] TIFFReadRGBATileExt(): fix (unsigned) integer > > > > overflow on > > > > - strips/tiles > 2 GB > > > > - > > > > -Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=53137 > > > > -Upstream-Status: Accepted > > > > ---- > > > > - libtiff/tif_getimage.c | 8 ++++---- > > > > - 1 file changed, 4 insertions(+), 4 deletions(-) > > > > - > > > > -diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c > > > > -index a4d0c1d6..60b94d8e 100644 > > > > ---- a/libtiff/tif_getimage.c > > > > -+++ b/libtiff/tif_getimage.c > > > > -@@ -3016,15 +3016,15 @@ TIFFReadRGBATileExt(TIFF* tif, uint32_t col, > > > > uint32_t row, uint32_t * raster, in > > > > - return( ok ); > > > > - > > > > - for( i_row = 0; i_row < read_ysize; i_row++ ) { > > > > -- memmove( raster + (tile_ysize - i_row - 1) * tile_xsize, > > > > -- raster + (read_ysize - i_row - 1) * read_xsize, > > > > -+ memmove( raster + (size_t)(tile_ysize - i_row - 1) * > > > > tile_xsize, > > > > -+ raster + (size_t)(read_ysize - i_row - 1) * > > > > read_xsize, > > > > - read_xsize * sizeof(uint32_t) ); > > > > -- _TIFFmemset( raster + (tile_ysize - i_row - 1) * > > > > tile_xsize+read_xsize, > > > > -+ _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * > > > > tile_xsize+read_xsize, > > > > - 0, sizeof(uint32_t) * (tile_xsize - read_xsize) > > > > ); > > > > - } > > > > - > > > > - for( i_row = read_ysize; i_row < tile_ysize; i_row++ ) { > > > > -- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize, > > > > -+ _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * > > > > tile_xsize, > > > > - 0, sizeof(uint32_t) * tile_xsize ); > > > > - } > > > > - > > > > --- > > > > -2.33.0 > > > > - > > > > diff --git a/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb > > > > b/meta/recipes-multimedia/libtiff/tiff_4.5.0.bb > > > > similarity index 75% > > > > rename from meta/recipes-multimedia/libtiff/tiff_4.4.0.bb > > > > rename to meta/recipes-multimedia/libtiff/tiff_4.5.0.bb > > > > index 970aab5433..2ed70f7500 100644 > > > > --- a/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb > > > > +++ b/meta/recipes-multimedia/libtiff/tiff_4.5.0.bb > > > > @@ -4,22 +4,13 @@ DESCRIPTION = "Library provides support for the Tag > > > > Image File Format \ > > > > provide means to easily access and create TIFF image files." > > > > HOMEPAGE = "http://www.libtiff.org/"; > > > > LICENSE = "BSD-2-Clause" > > > > -LIC_FILES_CHKSUM = > > > > "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf" > > > > +LIC_FILES_CHKSUM = > > > > "file://LICENSE.md;md5=a3e32d664d6db1386b4689c8121531c3" > > > > > > > > CVE_PRODUCT = "libtiff" > > > > > > > > -SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ > > > > - file://0001-fix-the-FPE-in-tiffcrop-415-427-and-428.patch \ > > > > - file://CVE-2022-34526.patch \ > > > > - file://CVE-2022-2953.patch \ > > > > - file://CVE-2022-3970.patch \ > > > > - > > > > file://0001-Revised-handling-of-TIFFTAG_INKNAMES-and-related-TIF.patch \ > > > > - file://0001-tiffcrop-S-option-Make-decision-simpler.patch \ > > > > - > > > > file://0001-tiffcrop-disable-incompatibility-of-Z-X-Y-z-options-.patch \ > > > > - > > > > file://0001-tiffcrop-subroutines-require-a-larger-buffer-fixes-2.patch \ > > > > - " > > > > - > > > > -SRC_URI[sha256sum] = > > > > "917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed" > > > > +SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz"; > > > > + > > > > +SRC_URI[sha256sum] = > > > > "c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464" > > > > > > > > # exclude betas > > > > UPSTREAM_CHECK_REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar" > > > > -- > > > > 2.30.2 > > > > > > > > > > > > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175560): https://lists.openembedded.org/g/openembedded-core/message/175560 Mute This Topic: https://lists.openembedded.org/mt/96047877/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
