sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't load 0 length profiles 

some tiffs have 0 length icc profiles ... test profile length before we
try to load it

see https://github.com/jcupitt/libvips/issues/605
This commit is contained in:
John Cupitt 2017-02-20 22:36:35 +00:00
parent 3f92cfc935
commit 197a21ed0e
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libvips/foreign/tiff2vips.c
View File

@ -203,8 +203,8 @@
*/ */
/* /*
#define DEBUG
*/ */
#define DEBUG
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -1253,7 +1253,9 @@ rtiff_set_header( Rtiff *rtiff, VipsImage *out )
/* Read any ICC profile. /* Read any ICC profile.
*/ */
if( TIFFGetField( rtiff->tiff, if( TIFFGetField( rtiff->tiff,
TIFFTAG_ICCPROFILE, &data_length, &data ) ) { TIFFTAG_ICCPROFILE, &data_length, &data ) &&
data &&
data_length ) {
void *data_copy; void *data_copy;
if( !(data_copy = vips_malloc( NULL, data_length )) ) if( !(data_copy = vips_malloc( NULL, data_length )) )
@ -1266,7 +1268,9 @@ rtiff_set_header( Rtiff *rtiff, VipsImage *out )
/* Read any XMP metadata. /* Read any XMP metadata.
*/ */
if( TIFFGetField( rtiff->tiff, if( TIFFGetField( rtiff->tiff,
TIFFTAG_XMLPACKET, &data_length, &data ) ) { TIFFTAG_XMLPACKET, &data_length, &data ) &&
data &&
data_length ) {
void *data_copy; void *data_copy;
if( !(data_copy = vips_malloc( NULL, data_length )) ) if( !(data_copy = vips_malloc( NULL, data_length )) )
@ -1279,7 +1283,9 @@ rtiff_set_header( Rtiff *rtiff, VipsImage *out )
/* Read any IPCT metadata. /* Read any IPCT metadata.
*/ */
if( TIFFGetField( rtiff->tiff, if( TIFFGetField( rtiff->tiff,
TIFFTAG_RICHTIFFIPTC, &data_length, &data ) ) { TIFFTAG_RICHTIFFIPTC, &data_length, &data ) &&
data &&
data_length ) {
void *data_copy; void *data_copy;
/* For no very good reason, libtiff stores IPCT as an array of /* For no very good reason, libtiff stores IPCT as an array of
@ -1297,7 +1303,9 @@ rtiff_set_header( Rtiff *rtiff, VipsImage *out )
/* Read any photoshop metadata. /* Read any photoshop metadata.
*/ */
if( TIFFGetField( rtiff->tiff, if( TIFFGetField( rtiff->tiff,
TIFFTAG_PHOTOSHOP, &data_length, &data ) ) { TIFFTAG_PHOTOSHOP, &data_length, &data ) &&
data &&
data_length ) {
void *data_copy; void *data_copy;
if( !(data_copy = vips_malloc( NULL, data_length )) ) if( !(data_copy = vips_malloc( NULL, data_length )) )