Internal libtiff: refresh with CVS

git-svn-id: https://svn.osgeo.org/gdal/trunk@35123 f0d54148-0727-0410-94bb-9a71ac55c965
celbal · Aug 15, 2016 · ecf36f6 · ecf36f6
1 parent ac491fe
commit ecf36f6
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/gdal/frmts/gtiff/libtiff/tif_pixarlog.c b/gdal/frmts/gtiff/libtiff/tif_pixarlog.c
@@ -1,4 +1,4 @@
-/* $Id: tif_pixarlog.c,v 1.45 2016-06-28 15:37:33 erouault Exp $ */
+/* $Id: tif_pixarlog.c,v 1.46 2016-08-15 20:49:48 erouault Exp $ */
 
 /*
  * Copyright (c) 1996-1997 Sam Leffler
@@ -1141,6 +1141,13 @@ PixarLogEncode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
 	}
 
 	llen = sp->stride * td->td_imagewidth;
+    /* Check against the number of elements (of size uint16) of sp->tbuf */
+    if( n > td->td_rowsperstrip * llen )
+    {
+        TIFFErrorExt(tif->tif_clientdata, module,
+                     "Too many input bytes provided");
+        return 0;
+    }
 
 	for (i = 0, up = sp->tbuf; i < n; i += llen, up += llen) {
 		switch (sp->user_datafmt)  {