XFA: Upgrade to libtiff 4.0.6.

third_party/libtiff/tif_write.c

-/* $Id: tif_write.c,v 1.37 2012-08-13 22:10:17 fwarmerdam Exp $ */
+/* $Id: tif_write.c,v 1.42 2015-06-07 23:00:23 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation for any purpose is hereby granted without fee, provided
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
@@ skipping 96 matching lines @@
                         return (-1);
                 tif->tif_curstrip = strip;
                 /*
                  * Watch out for a growing image.  The value of strips/image
                  * will initially be 1 (since it can't be deduced until the
                  * imagelength is known).
                  */
                 if (strip >= td->td_stripsperimage && imagegrew)
                         td->td_stripsperimage =
                             TIFFhowmany_32(td->td_imagelength,td->td_rowsperstrip);
+                if (td->td_stripsperimage == 0) {
+                        TIFFErrorExt(tif->tif_clientdata, module, "Zero strips per image");
+                        return (-1);
+                }
                 tif->tif_row =
                     (strip % td->td_stripsperimage) * td->td_rowsperstrip;
                 if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
                         if (!(*tif->tif_setupencode)(tif))
                                 return (-1);
                         tif->tif_flags |= TIFF_CODERSETUP;
                 }
         
                 tif->tif_rawcc = 0;
                 tif->tif_rawcp = tif->tif_rawdata;
@@ skipping 85 matching lines @@
          * Handle delayed allocation of data buffer.  This
          * permits it to be sized according to the directory
          * info.
          */
         if (!BUFFERCHECK(tif))
                 return ((tmsize_t) -1);
 
         tif->tif_flags |= TIFF_BUF4WRITE;
         tif->tif_curstrip = strip;
 
+        if (td->td_stripsperimage == 0) {
+                TIFFErrorExt(tif->tif_clientdata, module, "Zero strips per image");
+                return ((tmsize_t) -1);
+        }
+
         tif->tif_row = (strip % td->td_stripsperimage) * td->td_rowsperstrip;
         if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
                 if (!(*tif->tif_setupencode)(tif))
                         return ((tmsize_t) -1);
                 tif->tif_flags |= TIFF_CODERSETUP;
         }
 
         if( td->td_stripbytecount[strip] > 0 )
         {
             /* Make sure that at the first attempt of rewriting the tile, we will have */
@@ skipping 71 matching lines @@
                  * strips/image will initially be 1 (since it
                  * can't be deduced until the imagelength is known).
                  */
                 if (strip >= td->td_stripsperimage)
                         td->td_stripsperimage =
                             TIFFhowmany_32(td->td_imagelength,td->td_rowsperstrip);
                 if (!TIFFGrowStrips(tif, 1, module))
                         return ((tmsize_t) -1);
         }
         tif->tif_curstrip = strip;
+        if (td->td_stripsperimage == 0) {
+                TIFFErrorExt(tif->tif_clientdata, module,"Zero strips per image");
+                return ((tmsize_t) -1);
+        }
         tif->tif_row = (strip % td->td_stripsperimage) * td->td_rowsperstrip;
         return (TIFFAppendToStrip(tif, strip, (uint8*) data, cc) ?
             cc : (tmsize_t) -1);
 }
 
 /*
  * Write and compress a tile of data.  The
  * tile is selected by the (x,y,z,s) coordinates.
  */
 tmsize_t
@@ skipping 22 matching lines @@
  * NB: Image length must be setup before writing; this
  *     interface does not support automatically growing
  *     the image on each write (as TIFFWriteScanline does).
  */
 tmsize_t
 TIFFWriteEncodedTile(TIFF* tif, uint32 tile, void* data, tmsize_t cc)
 {
         static const char module[] = "TIFFWriteEncodedTile";
         TIFFDirectory *td;
         uint16 sample;
+        uint32 howmany32;
 
         if (!WRITECHECKTILES(tif, module))
                 return ((tmsize_t)(-1));
         td = &tif->tif_dir;
         if (tile >= td->td_nstrips) {
                 TIFFErrorExt(tif->tif_clientdata, module, "Tile %lu out of range, max %lu",
                     (unsigned long) tile, (unsigned long) td->td_nstrips);
                 return ((tmsize_t)(-1));
         }
         /*
          * Handle delayed allocation of data buffer.  This
          * permits it to be sized more intelligently (using
          * directory information).
          */
         if (!BUFFERCHECK(tif))
                 return ((tmsize_t)(-1));
 
         tif->tif_flags |= TIFF_BUF4WRITE;
         tif->tif_curtile = tile;
 
         if( td->td_stripbytecount[tile] > 0 )
         {
             /* Make sure that at the first attempt of rewriting the tile, we will have */
             /* more bytes available in the output buffer than the previous byte count, */
             /* so that TIFFAppendToStrip() will detect the overflow when it is called the first */
             /* time if the new compressed tile is bigger than the older one. (GDAL #4771) */
-            if( tif->tif_rawdatasize <= (tmsize_t)td->td_stripbytecount[tile] )
+            if( tif->tif_rawdatasize <= (tmsize_t) td->td_stripbytecount[tile] )
             {
                 if( !(TIFFWriteBufferSetup(tif, NULL,
                     (tmsize_t)TIFFroundup_64((uint64)(td->td_stripbytecount[tile] + 1), 1024))) )
                     return ((tmsize_t)(-1));
             }
 
             /* Force TIFFAppendToStrip() to consider placing data at end
                of file. */
             tif->tif_curoff = 0;
         }
 
-    tif->tif_rawcc = 0;
-    tif->tif_rawcp = tif->tif_rawdata;
+        tif->tif_rawcc = 0;
+        tif->tif_rawcp = tif->tif_rawdata;
 
         /* 
          * Compute tiles per row & per column to compute
          * current row and column
          */
-        tif->tif_row = (tile % TIFFhowmany_32(td->td_imagelength, td->td_tilelength))
-                * td->td_tilelength;
-        tif->tif_col = (tile % TIFFhowmany_32(td->td_imagewidth, td->td_tilewidth))
-                * td->td_tilewidth;
+        howmany32=TIFFhowmany_32(td->td_imagelength, td->td_tilelength);
+        if (howmany32 == 0) {
+                 TIFFErrorExt(tif->tif_clientdata,module,"Zero tiles");
+                return ((tmsize_t)(-1));
+        }
+        tif->tif_row = (tile % howmany32) * td->td_tilelength;
+        howmany32=TIFFhowmany_32(td->td_imagewidth, td->td_tilewidth);
+        if (howmany32 == 0) {
+                 TIFFErrorExt(tif->tif_clientdata,module,"Zero tiles");
+                return ((tmsize_t)(-1));
+        }
+        tif->tif_col = (tile % howmany32) * td->td_tilewidth;
 
         if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
                 if (!(*tif->tif_setupencode)(tif))
                         return ((tmsize_t)(-1));
                 tif->tif_flags |= TIFF_CODERSETUP;
         }
         tif->tif_flags &= ~TIFF_POSTENCODE;
         sample = (uint16)(tile/td->td_stripsperimage);
         if (!(*tif->tif_preencode)(tif, sample))
                 return ((tmsize_t)(-1));
@@ skipping 347 matching lines @@
 }
 
 /* vim: set ts=8 sts=8 sw=8 noet: */
 /*
  * Local Variables:
  * mode: c
  * c-basic-offset: 8
  * fill-column: 78
  * End:
  */
-