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

convi was leaking vectors

Browse Source 
we forgot to free the compiled code on dispose, oops

thanks MHeimbuc

see https://github.com/jcupitt/libvips/issues/771
This commit is contained in:
John Cupitt 2017-10-12 14:41:21 +01:00
parent 135d7a4dfb
commit c76b4893c0
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libvips/convolution/convi.c
View File

@ -74,6 +74,8 @@
* - new fixed-point vector path, up to 2x faster
* 2/7/17
* - remove pts for a small speedup
* 12/10/17
* - fix leak of vectors, thanks MHeimbuc
*/
/*
@ -196,6 +198,33 @@ typedef struct {
short *t2;
} VipsConviSequence;
static void
vips_convi_compile_free( VipsConvi *convi )
{
int i;
for( i = 0; i < convi->n_pass; i++ )
VIPS_FREEF( vips_vector_free, convi->pass[i].vector );
convi->n_pass = 0;
VIPS_FREEF( vips_vector_free, convi->vector );
}
static void
vips_convi_dispose( GObject *gobject )
{
VipsConvi *convi = (VipsConvi *) gobject;
#ifdef DEBUG
printf( "vips_convi_dispose: " );
vips_object_print_name( VIPS_OBJECT( gobject ) );
printf( "\n" );
#endif /*DEBUG*/
vips_convi_compile_free( convi );
G_OBJECT_CLASS( vips_convi_parent_class )->dispose( gobject );
}
/* Free a sequence value.
*/
static int
@ -257,17 +286,6 @@ vips_convi_start( VipsImage *out, void *a, void *b )
return( (void *) seq );
}
static void
vips_convi_compile_free( VipsConvi *convi )
{
int i;
for( i = 0; i < convi->n_pass; i++ )
VIPS_FREEF( vips_vector_free, convi->pass[i].vector );
convi->n_pass = 0;
VIPS_FREEF( vips_vector_free, convi->vector );
}
#define TEMP( N, S ) vips_vector_temporary( v, (char *) N, S )
#define PARAM( N, S ) vips_vector_parameter( v, (char *) N, S )
#define SCANLINE( N, P, S ) vips_vector_source_scanline( v, (char *) N, P, S )
@ -1003,8 +1021,11 @@ vips_convi_build( VipsObject *object )
static void
vips_convi_class_init( VipsConviClass *class )
{
GObjectClass *gobject_class = G_OBJECT_CLASS( class );
VipsObjectClass *object_class = (VipsObjectClass *) class;
gobject_class->dispose = vips_convi_dispose;
object_class->nickname = "convi";
object_class->description = _( "int convolution operation" );
object_class->build = vips_convi_build;