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

Merge branch '8.10'

Browse Source
This commit is contained in:
John Cupitt 2020-12-22 12:56:32 +00:00
commit eeb0fb3ac1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -12,6 +12,8 @@
18/12/20 started 8.10.5 18/12/20 started 8.10.5
- fix potential /0 in animated webp load [lovell] - fix potential /0 in animated webp load [lovell]
- don't seek on bad file descriptors [kleisauke]
- check for null memory sources [kleisauke]
14/12/20 started 8.10.4 14/12/20 started 8.10.4
- fix spng detection - fix spng detection

11
libvips/iofuncs/source.c
View File

@ -318,7 +318,9 @@ vips_source_build( VipsObject *object )
if( vips_object_argument_isset( object, "blob" ) ) { if( vips_object_argument_isset( object, "blob" ) ) {
size_t length; size_t length;
source->data = vips_blob_get( source->blob, &length ); if( !(source->data = vips_blob_get( source->blob, &length )) )
return( -1 );
source->length = VIPS_MIN( length, G_MAXSSIZE ); source->length = VIPS_MIN( length, G_MAXSSIZE );
} }
@ -346,16 +348,15 @@ vips_source_seek_real( VipsSource *source, gint64 offset, int whence )
{ {
VipsConnection *connection = VIPS_CONNECTION( source ); VipsConnection *connection = VIPS_CONNECTION( source );
gint64 new_pos;
VIPS_DEBUG_MSG( "vips_source_seek_real:\n" ); VIPS_DEBUG_MSG( "vips_source_seek_real:\n" );
/* Like _read_real(), we must not set a vips_error. We need to use the /* Like _read_real(), we must not set a vips_error. We need to use the
* vips__seek() wrapper so we can seek long files on Windows. * vips__seek() wrapper so we can seek long files on Windows.
*/ */
new_pos = vips__seek_no_error( connection->descriptor, offset, whence ); if( connection->descriptor != -1 )
return( vips__seek_no_error( connection->descriptor, offset, whence ) );
return( new_pos ); return( -1 );
} }
static void static void