From aacb1f89c5aa85d513dea8bdb1fd6818519bae2d Mon Sep 17 00:00:00 2001

From: Su Laus <sulau@freenet.de>

Date: Thu, 13 Oct 2022 14:33:27 +0000

Subject: [PATCH] (CVE-2022-3570 CVE-2022-3598) tiffcrop subroutines require a

 larger buffer (fixes #271, #381, #386, #388, #389, #435)

(cherry picked from commit afd7086090dafd3949afd172822cbcec4ed17d56)

---

 tools/tiffcrop.c | 205 +++++++++++++++++++++++++++--------------------

 1 file changed, 116 insertions(+), 89 deletions(-)

diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c

index 613ce7f8..70d56e55 100644

--- a/tools/tiffcrop.c

+++ b/tools/tiffcrop.c

@@ -212,6 +212,10 @@ static   char tiffcrop_rev_date[] = "02-09-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))