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

better stop on sinkdisc fail

Browse Source 
we were not always setting stop on allocate fail, could deadlock if (for
example) flush failed
This commit is contained in:
John Cupitt 2016-05-31 21:58:01 +01:00
parent d51911cda8
commit 45b6345e7f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libvips/iofuncs/sinkdisc.c
View File

@ -334,8 +334,10 @@ wbuffer_allocate_fn( VipsThreadState *state, void *a, gboolean *stop )
/* Block until the write of the previous buffer
* is done, then set write of this buffer going.
*/
if( wbuffer_flush( write ) )
if( wbuffer_flush( write ) ) {
*stop = TRUE;
return( -1 );
}
/* End of image?
*/
@ -359,10 +361,12 @@ wbuffer_allocate_fn( VipsThreadState *state, void *a, gboolean *stop )
/* Position buf at the new y.
*/
if( wbuffer_position( write->buf,
sink_base->y, sink_base->nlines ) )
sink_base->y, sink_base->nlines ) ) {
*stop = TRUE;
return( -1 );
}
}
}
/* x, y and buf are good: save params for thread.
*/