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

Add comments to setjmp invocations (#2751)

Browse Source 
Also, pre-increment `num_warnings` to ensure that we really stop
at 100 warnings.
This commit is contained in:
Kleis Auke Wolthuizen 2022-04-06 13:01:18 +02:00 committed by GitHub
parent 57cd94278a
commit 6c03343581
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libvips/foreign/jpeg2vips.c
View File

@ -322,12 +322,12 @@ readjpeg_emit_message( j_common_ptr cinfo, int msg_level )
if( msg_level < 0 ) { if( msg_level < 0 ) {
/* Always count warnings in num_warnings. /* Always count warnings in num_warnings.
*/ */
num_warnings = cinfo->err->num_warnings++; num_warnings = ++cinfo->err->num_warnings;
/* Corrupt files may give many warnings, the policy here is to /* Corrupt files may give many warnings, the policy here is to
* show only the first warning and treat many warnings as fatal. * show only the first warning and treat many warnings as fatal.
*/ */
if( num_warnings == 0 ) if( num_warnings == 1 )
(*cinfo->err->output_message)( cinfo ); (*cinfo->err->output_message)( cinfo );
else if( num_warnings >= 100 ) else if( num_warnings >= 100 )
cinfo->err->error_exit( cinfo ); cinfo->err->error_exit( cinfo );
@ -820,7 +820,8 @@ read_jpeg_generate( VipsRegion *or,
return( -1 ); return( -1 );
} }
/* Here for longjmp() from vips__new_error_exit(). /* Here for longjmp() from vips__new_error_exit() during
* jpeg_read_scanlines().
*/ */
if( setjmp( jpeg->eman.jmp ) ) { if( setjmp( jpeg->eman.jmp ) ) {
VIPS_GATE_STOP( "read_jpeg_generate: work" ); VIPS_GATE_STOP( "read_jpeg_generate: work" );
@ -877,7 +878,8 @@ read_jpeg_image( ReadJpeg *jpeg, VipsImage *out )
VipsImage *im; VipsImage *im;
/* Here for longjmp() from vips__new_error_exit(). /* Here for longjmp() from vips__new_error_exit() during
* jpeg_read_header() or jpeg_start_decompress().
*/ */
if( setjmp( jpeg->eman.jmp ) ) if( setjmp( jpeg->eman.jmp ) )
return( -1 ); return( -1 );
@ -988,6 +990,9 @@ vips__jpeg_read_source( VipsSource *source, VipsImage *out,
autorotate )) ) autorotate )) )
return( -1 ); return( -1 );
/* Here for longjmp() from vips__new_error_exit() during
* cinfo->mem->alloc_small() or jpeg_read_header().
*/
if( setjmp( jpeg->eman.jmp ) ) if( setjmp( jpeg->eman.jmp ) )
return( -1 ); return( -1 );