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

Merge pull request #1218 from lovell/profile-load-leaks

Browse Source 
profile_load: ensure once-ness, prevent profile use-after-free (master)
This commit is contained in:
John Cupitt 2019-01-25 12:51:38 +00:00 committed by GitHub
commit 40e272ce99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libvips/colour/profile_load.c
View File

@ -95,7 +95,7 @@ vips_fallback_profile_get_init( void )
static void *
vips_fallback_profile_get( const char *name, size_t *length )
{
GOnce once = G_ONCE_INIT;
static GOnce once = G_ONCE_INIT;
GSList *p;
@ -231,17 +231,17 @@ int
vips__profile_set( VipsImage *image, const char *name )
{
VipsBlob *profile;
void *data;
size_t length;
if( vips_profile_load( name, &profile, NULL ) )
return( -1 );
if( profile ) {
data = ((VipsArea *) profile)->data;
length = ((VipsArea *) profile)->length;
vips_image_set_blob( image, VIPS_META_ICC_NAME,
(VipsCallbackFn) NULL, data, length );
if( profile ) {
GValue value = { 0 };
g_value_init( &value, VIPS_TYPE_BLOB );
g_value_set_boxed( &value, profile );
vips_image_set( image, VIPS_META_ICC_NAME, &value );
g_value_unset( &value );
}
else
vips_image_remove( image, VIPS_META_ICC_NAME );