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

fix arg type for TIFFTAG_SUBIFD 

We were passing int* when TIFFGetField wanted unit16, so subifd counts
could sometimes be wrong.
This commit is contained in:
John Cupitt 2021-06-28 16:43:55 +01:00
parent 1b3dda5b24
commit a8c45be816
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libvips/foreign/tiff2vips.c
View File

@ -327,7 +327,7 @@ typedef struct _RtiffHeader {
*/ */
double stonits; double stonits;
/* Number of subifds, if any. /* Number of subifds, 0 for none.
*/ */
int subifd_count; int subifd_count;
@ -684,7 +684,7 @@ rtiff_set_page( Rtiff *rtiff, int page )
} }
if( rtiff->subifd >= 0 ) { if( rtiff->subifd >= 0 ) {
int subifd_count; uint16 subifd_count;
toff_t *subifd_offsets; toff_t *subifd_offsets;
if( !TIFFGetField( rtiff->tiff, TIFFTAG_SUBIFD, if( !TIFFGetField( rtiff->tiff, TIFFTAG_SUBIFD,
@ -694,8 +694,7 @@ rtiff_set_page( Rtiff *rtiff, int page )
return( -1 ); return( -1 );
} }
if( subifd_count <= 0 || if( rtiff->subifd >= subifd_count ) {
rtiff->subifd >= subifd_count ) {
vips_error( "tiff2vips", vips_error( "tiff2vips",
_( "subifd %d out of range, " _( "subifd %d out of range, "
"only 0-%d available" ), "only 0-%d available" ),
@ -2437,6 +2436,7 @@ rtiff_header_read( Rtiff *rtiff, RtiffHeader *header )
int i; int i;
uint16 extra_samples_count; uint16 extra_samples_count;
uint16 *extra_samples_types; uint16 *extra_samples_types;
uint16 subifd_count;
toff_t *subifd_offsets; toff_t *subifd_offsets;
char *image_description; char *image_description;
@ -2545,10 +2545,11 @@ rtiff_header_read( Rtiff *rtiff, RtiffHeader *header )
header->separate = TRUE; header->separate = TRUE;
} }
/* Stays zero if there's no SUBIFD. /* TIFFGetField needs a uint16 to write count to.
*/ */
TIFFGetField( rtiff->tiff, TIFFTAG_SUBIFD, if( TIFFGetField( rtiff->tiff, TIFFTAG_SUBIFD,
&header->subifd_count, &subifd_offsets ); &subifd_count, &subifd_offsets ) )
header->subifd_count = subifd_count;
/* IMAGEDESCRIPTION often has useful metadata. libtiff makes sure /* IMAGEDESCRIPTION often has useful metadata. libtiff makes sure
* that data is null-terminated and contains no embedded null * that data is null-terminated and contains no embedded null