Merge branch '8.13'

This commit is contained in:
John Cupitt 2022-11-09 14:53:43 +00:00
commit b8a2d26ad9
3 changed files with 8 additions and 0 deletions

View File

@ -20,6 +20,9 @@ master
- support for N-colour ICC profiles - support for N-colour ICC profiles
- GIF load supports truncated frames [tlsa] - GIF load supports truncated frames [tlsa]
9/11/22 started 8.13.4
- missing include in mosaic_fuzzer [ServOKio]
11/10/22 started 8.13.3 11/10/22 started 8.13.3
- improve rules for 16-bit heifsave [johntrunc] - improve rules for 16-bit heifsave [johntrunc]
- improve libspng pallette write [kleisauke] - improve libspng pallette write [kleisauke]

View File

@ -1,3 +1,4 @@
#include <cstring>
#include <vips/vips.h> #include <vips/vips.h>
struct mosaic_opt { struct mosaic_opt {

View File

@ -167,6 +167,10 @@ vips_exif_load_data_without_fix( const void *data, size_t length )
/* exif_data_load_data() only allows uint for length. Limit it to less /* exif_data_load_data() only allows uint for length. Limit it to less
* than that: 2**20 should be enough for anyone. * than that: 2**20 should be enough for anyone.
*/ */
if( length < 4 ) {
vips_error( "exif", "%s", _( "exif too small" ) );
return( NULL );
}
if( length > 1 << 20 ) { if( length > 1 << 20 ) {
vips_error( "exif", "%s", _( "exif too large" ) ); vips_error( "exif", "%s", _( "exif too large" ) );
return( NULL ); return( NULL );