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

fix a race associated with sink_screen

Browse Source 
sink_screen was not keeping a ref to its input, so in rare conditions
it could try to make a region on a dead image
This commit is contained in:
John Cupitt 2018-01-05 16:27:44 +00:00
parent 3dfd6b8643
commit 1b89d62eb5
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
5/1/18 started 8.6.2
- vips_sink_screen() keeps a ref to the input image ... stops a rare race
10/12/17 started 8.6.1 10/12/17 started 8.6.1
- fix mmap window new/free cycling - fix mmap window new/free cycling
- fix some compiler warnings - fix some compiler warnings

6
configure.ac
View File

@ -2,7 +2,7 @@
# also update the version number in the m4 macros below # also update the version number in the m4 macros below
AC_INIT([vips], [8.6.1], [vipsip@jiscmail.ac.uk]) AC_INIT([vips], [8.6.2], [vipsip@jiscmail.ac.uk])
# required for gobject-introspection # required for gobject-introspection
AC_PREREQ(2.62) AC_PREREQ(2.62)
@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
# user-visible library versioning # user-visible library versioning
m4_define([vips_major_version], [8]) m4_define([vips_major_version], [8])
m4_define([vips_minor_version], [6]) m4_define([vips_minor_version], [6])
m4_define([vips_micro_version], [1]) m4_define([vips_micro_version], [2])
m4_define([vips_version], m4_define([vips_version],
[vips_major_version.vips_minor_version.vips_micro_version]) [vips_major_version.vips_minor_version.vips_micro_version])
@ -38,7 +38,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date -u -r ChangeLog`
# binary interface changes not backwards compatible?: reset age to 0 # binary interface changes not backwards compatible?: reset age to 0
LIBRARY_CURRENT=50 LIBRARY_CURRENT=50
LIBRARY_REVISION=1 LIBRARY_REVISION=2
LIBRARY_AGE=8 LIBRARY_AGE=8
# patched into include/vips/version.h # patched into include/vips/version.h

1
libvips/iofuncs/init.c
View File

@ -516,6 +516,7 @@ vips_leak( void )
fprintf( stderr, "%s", vips_buf_all( &buf ) ); fprintf( stderr, "%s", vips_buf_all( &buf ) );
vips__print_renders();
#ifdef DEBUG #ifdef DEBUG
vips_buffer_dump_all(); vips_buffer_dump_all();

20
libvips/iofuncs/sinkscreen.c
View File

@ -234,6 +234,8 @@ render_free( Render *render )
VIPS_FREEF( g_slist_free, render->dirty ); VIPS_FREEF( g_slist_free, render->dirty );
VIPS_FREEF( g_hash_table_destroy, render->tiles ); VIPS_FREEF( g_hash_table_destroy, render->tiles );
VIPS_UNREF( render->in );
vips_free( render ); vips_free( render );
#ifdef VIPS_DEBUG_AMBER #ifdef VIPS_DEBUG_AMBER
@ -608,6 +610,10 @@ render_new( VipsImage *in, VipsImage *out, VipsImage *mask,
if( !(render = VIPS_NEW( NULL, Render )) ) if( !(render = VIPS_NEW( NULL, Render )) )
return( NULL ); return( NULL );
/* render must hold a ref to in. This is dropped in render_free().
*/
g_object_ref( in );
render->ref_count = 1; render->ref_count = 1;
render->ref_count_lock = vips_g_mutex_new(); render->ref_count_lock = vips_g_mutex_new();
@ -1126,7 +1132,19 @@ void
vips__print_renders( void ) vips__print_renders( void )
{ {
#ifdef VIPS_DEBUG_AMBER #ifdef VIPS_DEBUG_AMBER
if( render_num_renders > 0 )
printf( "%d active renders\n", render_num_renders ); printf( "%d active renders\n", render_num_renders );
#endif /*VIPS_DEBUG_AMBER*/ #endif /*VIPS_DEBUG_AMBER*/
printf( "%d dirty renders\n", g_slist_length( render_dirty_all ) );
if( render_dirty_lock ) {
int n_dirty;
g_mutex_lock( render_dirty_lock );
n_dirty = g_slist_length( render_dirty_all );
if( n_dirty > 0 )
printf( "%d dirty renders\n", n_dirty );
g_mutex_unlock( render_dirty_lock );
}
} }