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

free png write on end of write, not image dispose

Browse Source 
We were freeing the PNG write struct on image dispose, not at the end of
write.

Thanks homm. See https://github.com/libvips/pyvips/issues/147
This commit is contained in:
John Cupitt 2020-01-02 15:51:42 +00:00
parent 3b2c77dd35
commit ecb22cdecc
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libvips/foreign/vipspng.c
View File

@ -778,12 +778,8 @@ write_finish( Write *write )
VIPS_UNREF( write->target ); VIPS_UNREF( write->target );
if( write->pPng ) if( write->pPng )
png_destroy_write_struct( &write->pPng, &write->pInfo ); png_destroy_write_struct( &write->pPng, &write->pInfo );
} VIPS_FREE( write->row_pointer );
VIPS_FREE( write );
static void
write_destroy( VipsImage *out, Write *write )
{
write_finish( write );
} }
static void static void
@ -800,22 +796,22 @@ write_new( VipsImage *in, VipsTarget *target )
{ {
Write *write; Write *write;
if( !(write = VIPS_NEW( in, Write )) ) if( !(write = VIPS_NEW( NULL, Write )) )
return( NULL ); return( NULL );
memset( write, 0, sizeof( Write ) ); memset( write, 0, sizeof( Write ) );
write->in = in; write->in = in;
write->memory = NULL; write->memory = NULL;
write->target = target; write->target = target;
g_object_ref( target ); g_object_ref( target );
g_signal_connect( in, "close",
G_CALLBACK( write_destroy ), write );
if( !(write->row_pointer = VIPS_ARRAY( in, in->Ysize, png_bytep )) ) if( !(write->row_pointer = VIPS_ARRAY( NULL, in->Ysize, png_bytep )) )
return( NULL ); return( NULL );
if( !(write->pPng = png_create_write_struct( if( !(write->pPng = png_create_write_struct(
PNG_LIBPNG_VER_STRING, NULL, PNG_LIBPNG_VER_STRING, NULL,
user_error_function, user_warning_function )) ) user_error_function, user_warning_function )) ) {
write_finish( write );
return( NULL ); return( NULL );
}
#ifdef PNG_SKIP_sRGB_CHECK_PROFILE #ifdef PNG_SKIP_sRGB_CHECK_PROFILE
/* Prevent libpng (>=1.6.11) verifying sRGB profiles. /* Prevent libpng (>=1.6.11) verifying sRGB profiles.
@ -828,11 +824,15 @@ write_new( VipsImage *in, VipsTarget *target )
/* Catch PNG errors from png_create_info_struct(). /* Catch PNG errors from png_create_info_struct().
*/ */
if( setjmp( png_jmpbuf( write->pPng ) ) ) if( setjmp( png_jmpbuf( write->pPng ) ) ) {
write_finish( write );
return( NULL ); return( NULL );
}
if( !(write->pInfo = png_create_info_struct( write->pPng )) ) if( !(write->pInfo = png_create_info_struct( write->pPng )) ) {
write_finish( write );
return( NULL ); return( NULL );
}
return( write ); return( write );
} }