cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Andrey Kiselev 2010-07-01 15:56:56 +00:00
parent ec2b508f60
commit 0cd06f1134
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2010-07-01 Andrey Kiselev <dron@ak4719.spb.edu>
* tools/tiffgt.c: Properly check the raster buffer allocations for
integer overflows. As per bug
http://bugzilla.maptools.org/show_bug.cgi?id=2108
* m4/acinclude.m4: Update GL/GLU/GLUt/Pthread macros from the
upstream.
* libtiff/{tif_aux.c, tif_strip.c, tif_tile.c, tiffiop.h}: Move
multiply_32() and multiply_64() functions into tif_aux.c file and
rename them into _TIFFMultiply32() and _TIFFMultiply64() respectively.
2010-06-30 Andrey Kiselev <dron@ak4719.spb.edu> 2010-06-30 Andrey Kiselev <dron@ak4719.spb.edu>
* tools/tiff2pdf.c: Better generation of ID field in * tools/tiff2pdf.c: Better generation of ID field in

34
tools/tiffgt.c
View File

@ -1,4 +1,4 @@
/* $Id: tiffgt.c,v 1.9 2010-03-10 18:56:50 bfriesen Exp $ */ /* $Id: tiffgt.c,v 1.10 2010-07-01 15:56:56 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -40,6 +40,7 @@
#endif #endif
#include "tiffio.h" #include "tiffio.h"
#include "tiffiop.h"
#ifndef HAVE_GETOPT #ifndef HAVE_GETOPT
extern int getopt(int, char**, char*); extern int getopt(int, char**, char*);
@ -224,21 +225,24 @@ initImage(void)
w = xmax; w = xmax;
} }
if (w != width || h != height) { if (w != width || h != height) {
if (raster != NULL) uint32 rastersize =
_TIFFfree(raster), raster = NULL; _TIFFMultiply32(tif, img.width, img.height, "allocating raster buffer");
raster = (uint32*) _TIFFmalloc(img.width * img.height * sizeof (uint32)); if (raster != NULL)
if (raster == NULL) { _TIFFfree(raster), raster = NULL;
width = height = 0; raster = (uint32*) _TIFFCheckMalloc(tif, rastersize, sizeof (uint32),
TIFFError(filelist[fileindex], "No space for raster buffer"); "allocating raster buffer");
cleanup_and_exit(); if (raster == NULL) {
} width = height = 0;
width = w; TIFFError(filelist[fileindex], "No space for raster buffer");
height = h; cleanup_and_exit();
} }
TIFFRGBAImageGet(&img, raster, img.width, img.height); width = w;
height = h;
}
TIFFRGBAImageGet(&img, raster, img.width, img.height);
#if HOST_BIGENDIAN #if HOST_BIGENDIAN
TIFFSwabArrayOfLong(raster,img.width*img.height); TIFFSwabArrayOfLong(raster,img.width*img.height);
#endif #endif
return 0; return 0;
} }