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

don't modify the operation cache in a callback

Browse Source 
oops, we were removing things from the operation hash during a traverse
This commit is contained in:
John Cupitt 2011-10-17 13:46:27 +01:00
parent ac377c143b
commit 2766b83004
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libvips/iofuncs/cache.c
View File

@ -463,14 +463,6 @@ vips_cache_drop( VipsOperation *operation )
vips_cache_unref( operation ); vips_cache_unref( operation );
} }
static gboolean
vips_cache_drop_all_cb( VipsOperation *key, VipsOperation *value, void *none )
{
vips_cache_drop( key );
return( TRUE );
}
/** /**
* vips_cache_drop_all: * vips_cache_drop_all:
* *
@ -479,9 +471,22 @@ vips_cache_drop_all_cb( VipsOperation *key, VipsOperation *value, void *none )
void void
vips_cache_drop_all( void ) vips_cache_drop_all( void )
{ {
if( vips_cache_table ) if( vips_cache_table ) {
g_hash_table_foreach_remove( vips_cache_table, /* We can't modify the hash in the callback from
(GHRFunc) vips_cache_drop_all_cb, NULL ); * g_hash_table_foreach() and friends. Repeatedly drop the
* first item instead.
*/
for(;;) {
GHashTableIter iter;
gpointer key, value;
g_hash_table_iter_init( &iter, vips_cache_table );
if( !g_hash_table_iter_next( &iter, &key, &value ) )
break;
vips_cache_drop( (VipsOperation *) key );
}
}
} }
static void static void