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

Merge branch 'master' into add-stream-object

Browse Source
This commit is contained in:
John Cupitt 2019-10-30 09:02:09 +00:00
commit 36ed7e7ef3
10 changed files with 29 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuzz/jpegsave_buffer_fuzzer.cc
View File

@ -17,11 +17,9 @@ LLVMFuzzerTestOneInput( const guint8 *data, size_t size )
if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) ) if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) )
return( 0 ); return( 0 );
/* Skip big images. They are likely to timeout. if( image->Xsize > 100 ||
*/ image->Ysize > 100 ||
if( image->Xsize > 1024 || image->Bands > 4 ) {
image->Ysize > 1024 ||
image->Bands > 10 ) {
g_object_unref( image ); g_object_unref( image );
return( 0 ); return( 0 );
} }

8
fuzz/jpegsave_file_fuzzer.cc
View File

@ -19,11 +19,9 @@ test_one_file( const char *name )
NULL )) ) NULL )) )
return( 0 ); return( 0 );
/* Skip big images. They are likely to timeout. if( image->Xsize > 100 ||
*/ image->Ysize > 100 ||
if( image->Xsize > 1024 || image->Bands > 4 ) {
image->Ysize > 1024 ||
image->Bands > 10 ) {
g_object_unref( image ); g_object_unref( image );
return( 0 ); return( 0 );
} }

12
fuzz/mosaic_fuzzer.cc
View File

@ -22,17 +22,15 @@ LLVMFuzzerTestOneInput( const guint8 *data, size_t size )
struct mosaic_opt *opt; struct mosaic_opt *opt;
double d; double d;
if( size < sizeof(struct mosaic_opt) ) if( size < sizeof( struct mosaic_opt ) )
return( 0 ); return( 0 );
if( !(ref = vips_image_new_from_buffer( data, size, "", NULL )) ) if( !(ref = vips_image_new_from_buffer( data, size, "", NULL )) )
return( 0 ); return( 0 );
/* Skip big images. They are likely to timeout. if( ref->Xsize > 100 ||
*/ ref->Ysize > 100 ||
if( ref->Xsize > 1024 || ref->Bands > 4 ) {
ref->Ysize > 1024 ||
ref->Bands > 10 ) {
g_object_unref( ref ); g_object_unref( ref );
return( 0 ); return( 0 );
} }
@ -44,7 +42,7 @@ LLVMFuzzerTestOneInput( const guint8 *data, size_t size )
/* Extract some bytes from the tail to fuzz the arguments of the API. /* Extract some bytes from the tail to fuzz the arguments of the API.
*/ */
opt = (struct mosaic_opt *) (data + size - sizeof(struct mosaic_opt)); opt = (struct mosaic_opt *) (data + size - sizeof( struct mosaic_opt ));
if( vips_mosaic( ref, sec, &out, (VipsDirection) opt->dir, if( vips_mosaic( ref, sec, &out, (VipsDirection) opt->dir,
opt->xref, opt->yref, opt->xsec, opt->ysec, NULL ) ) { opt->xref, opt->yref, opt->xsec, opt->ysec, NULL ) ) {

8
fuzz/pngsave_buffer_fuzzer.cc
View File

@ -17,11 +17,9 @@ LLVMFuzzerTestOneInput( const guint8 *data, size_t size )
if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) ) if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) )
return( 0 ); return( 0 );
/* Skip big images. They are likely to timeout. if( image->Xsize > 100 ||
*/ image->Ysize > 100 ||
if( image->Xsize > 1024 || image->Bands > 4 ) {
image->Ysize > 1024 ||
image->Bands > 10 ) {
g_object_unref( image ); g_object_unref( image );
return( 0 ); return( 0 );
} }

8
fuzz/sharpen_fuzzer.cc
View File

@ -16,11 +16,9 @@ LLVMFuzzerTestOneInput( const guint8 *data, size_t size )
if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) ) if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) )
return( 0 ); return( 0 );
/* Skip big images. They are likely to timeout. if( image->Xsize > 100 ||
*/ image->Ysize > 100 ||
if( image->Xsize > 1024 || image->Bands > 4 ) {
image->Ysize > 1024 ||
image->Bands > 10 ) {
g_object_unref( image ); g_object_unref( image );
return( 0 ); return( 0 );
} }

8
fuzz/smartcrop_fuzzer.cc
View File

@ -16,11 +16,9 @@ LLVMFuzzerTestOneInput( const guint8 *data, size_t size )
if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) ) if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) )
return( 0 ); return( 0 );
/* Skip big images. They are likely to timeout. if( image->Xsize > 100 ||
*/ image->Ysize > 100 ||
if( image->Xsize > 1024 || image->Bands > 4 ) {
image->Ysize > 1024 ||
image->Bands > 10 ) {
g_object_unref( image ); g_object_unref( image );
return( 0 ); return( 0 );
} }

8
fuzz/thumbnail_fuzzer.cc
View File

@ -16,11 +16,9 @@ LLVMFuzzerTestOneInput( const guint8 *data, size_t size )
if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) ) if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) )
return( 0 ); return( 0 );
/* Skip big images. They are likely to timeout. if( image->Xsize > 100 ||
*/ image->Ysize > 100 ||
if( image->Xsize > 1024 || image->Bands > 4 ) {
image->Ysize > 1024 ||
image->Bands > 10 ) {
g_object_unref( image ); g_object_unref( image );
return( 0 ); return( 0 );
} }

8
fuzz/webpsave_buffer_fuzzer.cc
View File

@ -17,11 +17,9 @@ LLVMFuzzerTestOneInput( const guint8 *data, size_t size )
if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) ) if( !(image = vips_image_new_from_buffer( data, size, "", NULL )) )
return( 0 ); return( 0 );
/* Skip big images. They are likely to timeout. if( image->Xsize > 100 ||
*/ image->Ysize > 100 ||
if( image->Xsize > 1024 || image->Bands > 4 ) {
image->Ysize > 1024 ||
image->Bands > 10 ) {
g_object_unref( image ); g_object_unref( image );
return( 0 ); return( 0 );
} }

4
libvips/Makefile.am
View File

@ -87,7 +87,7 @@ AM_LDFLAGS = \
LDADD = @INTROSPECTION_LIBS@ @VIPS_CFLAGS@ libvips.la @VIPS_LIBS@ LDADD = @INTROSPECTION_LIBS@ @VIPS_CFLAGS@ libvips.la @VIPS_LIBS@
noinst_PROGRAMS = \ noinst_PROGRAMS = \
introspect introspect$(EXEEXT)
introspect_SOURCES = \ introspect_SOURCES = \
introspect.c introspect.c
@ -96,7 +96,7 @@ introspect_SOURCES = \
introspection_sources = @vips_introspection_sources@ introspection_sources = @vips_introspection_sources@
# we make the vips8 API # we make the vips8 API
Vips-8.0.gir: introspect Vips-8.0.gir: introspect$(EXEEXT)
Vips_8_0_gir_INCLUDES = GObject-2.0 Vips_8_0_gir_INCLUDES = GObject-2.0
Vips_8_0_gir_CFLAGS = $(INCLUDES) -I${top_srcdir}/libvips/include Vips_8_0_gir_CFLAGS = $(INCLUDES) -I${top_srcdir}/libvips/include
Vips_8_0_gir_LIBS = libvips.la Vips_8_0_gir_LIBS = libvips.la

4
libvips/conversion/autorot.c
View File

@ -98,10 +98,6 @@ vips_autorot_get_angle( VipsImage *im )
default: default:
/* Other values do rotate + mirror, don't bother handling them /* Other values do rotate + mirror, don't bother handling them
* though, how common can mirroring be. * though, how common can mirroring be.
*
* See:
*
* http://www.80sidea.com/archives/2316
*/ */
angle = VIPS_ANGLE_D0; angle = VIPS_ANGLE_D0;
break; break;