XFA: Upgrade to libtiff 4.0.6.

third_party/libtiff/tif_tile.c

-/* $Id: tif_tile.c,v 1.23 2012-06-06 05:33:55 fwarmerdam Exp $ */
+/* $Id: tif_tile.c,v 1.24 2015-06-07 22:35:40 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1991-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 124 matching lines @@
                     "TIFFNumberOfTiles");
         return (ntiles);
 }
 
 /*
  * Compute the # bytes in each row of a tile.
  */
 uint64
 TIFFTileRowSize64(TIFF* tif)
 {
+        static const char module[] = "TIFFTileRowSize64";
         TIFFDirectory *td = &tif->tif_dir;
         uint64 rowsize;
+        uint64 tilerowsize;
 
-        if (td->td_tilelength == 0 || td->td_tilewidth == 0)
+        if (td->td_tilelength == 0)
+        {
+                TIFFErrorExt(tif->tif_clientdata,module,"Tile length is zero");
+                return 0;
+        }
+        if (td->td_tilewidth == 0)
+        {
+                TIFFErrorExt(tif->tif_clientdata,module,"Tile width is zero");
                 return (0);
+        }
         rowsize = _TIFFMultiply64(tif, td->td_bitspersample, td->td_tilewidth,
             "TIFFTileRowSize");
         if (td->td_planarconfig == PLANARCONFIG_CONTIG)
+        {
+                if (td->td_samplesperpixel == 0)
+                {
+                        TIFFErrorExt(tif->tif_clientdata,module,"Samples per pixel is zero");
+                        return 0;
+                }
                 rowsize = _TIFFMultiply64(tif, rowsize, td->td_samplesperpixel,
                     "TIFFTileRowSize");
-        return (TIFFhowmany8_64(rowsize));
+        }
+        tilerowsize=TIFFhowmany8_64(rowsize);
+        if (tilerowsize == 0)
+        {
+                TIFFErrorExt(tif->tif_clientdata,module,"Computed tile row size is zero");
+                return 0;
+        }
+        return (tilerowsize);
 }
 tmsize_t
 TIFFTileRowSize(TIFF* tif)
 {
         static const char module[] = "TIFFTileRowSize";
         uint64 m;
         tmsize_t n;
         m=TIFFTileRowSize64(tif);
         n=(tmsize_t)m;
         if ((uint64)n!=m)
@@ skipping 123 matching lines @@
 }
 
 /* vim: set ts=8 sts=8 sw=8 noet: */
 /*
  * Local Variables:
  * mode: c
  * c-basic-offset: 8
  * fill-column: 78
  * End:
  */
-