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

better sanity check for buffer sizing

Browse Source
This commit is contained in:
John Cupitt 2013-09-24 11:38:17 +01:00
parent ee336b0199
commit aeaafe568b
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TODO
View File

@ -1,9 +1,3 @@
- tiff save needs relaxing too
support all vips numeric formats, including complex and double comples
tiffsave.c and vips2tiff.c both need work
- finish hist_ismonotonic()
needs im_conv()

38
libvips/foreign/vips2tiff.c
View File

@ -596,17 +596,6 @@ write_tiff_header( TiffWrite *tw, TIFF *tif, int width, int height )
TIFFSetField( tif, TIFFTAG_SAMPLEFORMAT, format );
/* Double check: buffers should match in size.
*/
if( tw->im->Coding != VIPS_CODING_LABQ &&
!tw->onebit &&
TIFFScanlineSize( tif ) !=
VIPS_IMAGE_SIZEOF_LINE( tw->im ) ) {
vips_error( "vips2tiff",
"%s", _( "unsupported image format" ) );
return( -1 );
}
return( 0 );
}
@ -1096,6 +1085,22 @@ write_tif_tilewise( TiffWrite *tw )
{
VipsImage *im = tw->im;
/* Double check: buffers should match in size, except for onebit and
* labq modes.
*/
{
size_t vips_tile_size =
VIPS_IMAGE_SIZEOF_PEL( im ) * tw->tilew * tw->tileh;
if( tw->im->Coding != VIPS_CODING_LABQ &&
!tw->onebit &&
TIFFTileSize( tw->tif ) != vips_tile_size ) {
vips_error( "vips2tiff",
"%s", _( "unsupported image format" ) );
return( -1 );
}
}
g_assert( !tw->tbuf );
if( !(tw->tbuf = vips_malloc( NULL, TIFFTileSize( tw->tif ) )) )
return( -1 );
@ -1158,6 +1163,17 @@ write_tif_stripwise( TiffWrite *tw )
{
g_assert( !tw->tbuf );
/* Double check: buffers should match in size, except for onebit and
* labq modes.
*/
if( tw->im->Coding != VIPS_CODING_LABQ &&
!tw->onebit &&
TIFFTileSize( tw->tif ) != VIPS_IMAGE_SIZEOF_LINE( tw->im ) ) {
vips_error( "vips2tiff",
"%s", _( "unsupported image format" ) );
return( -1 );
}
if( !(tw->tbuf = vips_malloc( NULL, TIFFScanlineSize( tw->tif ) )) )
return( -1 );