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

more robust vips file read

Browse Source
This commit is contained in:
John Cupitt 2016-05-17 19:43:47 +01:00
parent 92a6ff19a1
commit af34f8f3ef
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvips/iofuncs/buffer.c
View File

@ -156,7 +156,7 @@ vips_buffer_dump_all( void )
static void
vips_buffer_free( VipsBuffer *buffer )
{
vips_tracked_free( buffer->buf );
VIPS_FREEF( vips_tracked_free, buffer->buf );
buffer->bsize = 0;
g_free( buffer );

3
libvips/iofuncs/sinkdisc.c
View File

@ -300,7 +300,8 @@ wbuffer_position( WriteBuffer *wbuffer, int top, int height )
/* This should be an exclusive buffer, hopefully.
*/
g_assert( !wbuffer->region->buffer->done );
if( !result )
g_assert( !wbuffer->region->buffer->done );
return( result );
}

8
libvips/iofuncs/vips.c
View File

@ -792,7 +792,7 @@ vips__write_extension_block( VipsImage *im, void *buf, int size )
psize = image_pixel_length( im );
if( (length = vips_file_length( im->fd )) == -1 )
return( -1 );
if( length - psize < 0 ) {
if( length < psize ) {
vips_error( "VipsImage", "%s", _( "file has been truncated" ) );
return( -1 );
}
@ -894,13 +894,15 @@ vips_image_open_input( VipsImage *image )
return( -1 );
}
/* Predict and check the file size.
/* Predict and check the file size. Only issue a warning, we want to be
* able to read all the header fields we can, even if the actual data
* isn't there.
*/
psize = image_pixel_length( image );
if( (rsize = vips_file_length( image->fd )) == -1 )
return( -1 );
image->file_length = rsize;
if( psize > rsize )
if( psize > rsize )
vips_warn( "VipsImage",
_( "unable to read data for \"%s\", %s" ),
image->filename, _( "file has been truncated" ) );