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

Fix read from pipe with variable chunk sizes

Browse Source 
free the header cache only once it's exhausted
This commit is contained in:
John Cupitt 2022-01-24 11:27:22 +00:00
parent 774c969d43
commit 646f2d7fd7
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libvips/foreign/jpeg2vips.c
View File

@ -244,7 +244,7 @@ source_fill_input_buffer( j_decompress_ptr cinfo )
Source *src = (Source *) cinfo->src; Source *src = (Source *) cinfo->src;
size_t read; size_t read;
if( (read = vips_source_read( src->source, if( (read = vips_source_read( src->source,
src->buf, SOURCE_BUFFER_SIZE )) > 0 ) { src->buf, SOURCE_BUFFER_SIZE )) > 0 ) {
src->pub.next_input_byte = src->buf; src->pub.next_input_byte = src->buf;
@ -861,6 +861,11 @@ read_jpeg_image( ReadJpeg *jpeg, VipsImage *out )
if( read_jpeg_header( jpeg, t[0] ) ) if( read_jpeg_header( jpeg, t[0] ) )
return( -1 ); return( -1 );
/* Switch to pixel decode.
*/
if( vips_source_decode( jpeg->source ) )
return( -1 );
jpeg_start_decompress( cinfo ); jpeg_start_decompress( cinfo );
#ifdef DEBUG #ifdef DEBUG
@ -967,10 +972,6 @@ vips__jpeg_read_source( VipsSource *source, VipsImage *out,
if( header_only ) if( header_only )
vips_source_minimise( source ); vips_source_minimise( source );
else {
if( vips_source_decode( source ) )
return( -1 );
}
return( 0 ); return( 0 );
} }

15
libvips/iofuncs/source.c
View File

@ -664,13 +664,12 @@ vips_source_decode( VipsSource *source )
if( !source->decode ) { if( !source->decode ) {
source->decode = TRUE; source->decode = TRUE;
VIPS_FREEF( g_byte_array_unref, source->sniff ); VIPS_FREEF( g_byte_array_unref, source->sniff );
/* If this is still a pipe source, we can discard the header /* Now decode is set, header_bytes will be freed once it's
* bytes we saved. * exhausted, see vips_source_read().
*/ */
if( source->is_pipe )
VIPS_FREEF( g_byte_array_unref, source->header_bytes );
} }
vips_source_minimise( source ); vips_source_minimise( source );
@ -766,6 +765,14 @@ vips_source_read( VipsSource *source, void *buffer, size_t length )
total_read += available; total_read += available;
} }
/* We're in pixel decode mode and we've exhausted the header
* cache. We can safely junk it.
*/
if( source->decode &&
source->header_bytes &&
source->read_position >= source->header_bytes->len )
VIPS_FREEF( g_byte_array_unref, source->header_bytes );
/* Any more bytes requested? Call the read() vfunc. /* Any more bytes requested? Call the read() vfunc.
*/ */
if( length > 0 ) { if( length > 0 ) {