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

Merge branch 'master' of github.com:libvips/libvips

Browse Source
This commit is contained in:
John Cupitt 2020-11-22 16:05:19 +00:00
commit 9f22c5dbf3
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@
- better GraphicsMagick image write [bfriesen] - better GraphicsMagick image write [bfriesen]
- add missing read loops to spng, heif, giflib and ppm load [kleisauke] - add missing read loops to spng, heif, giflib and ppm load [kleisauke]
- block zero width or height images from imagemagick load [Koen1999] - block zero width or height images from imagemagick load [Koen1999]
- check for overflow in gifload height [lovell]
- fix msb_first default in ppm load [ewelot] - fix msb_first default in ppm load [ewelot]
6/9/20 started 8.10.2 6/9/20 started 8.10.2

BIN
fuzz/common_fuzzer_corpus/sharpen_fuzzer-5806172036399104 Normal file
View File

Binary file not shown.

10
libvips/foreign/gifload.c
View File

@ -700,8 +700,16 @@ vips_foreign_load_gif_scan_extension( VipsForeignLoadGif *gif )
static int static int
vips_foreign_load_gif_set_header( VipsForeignLoadGif *gif, VipsImage *image ) vips_foreign_load_gif_set_header( VipsForeignLoadGif *gif, VipsImage *image )
{ {
const gint64 total_height = (gint64) gif->file->SHeight * gif->n;
if( total_height <= 0 ||
total_height > VIPS_MAX_COORD ) {
vips_error( "gifload", "%s", _( "image size out of bounds" ) );
return( -1 );
}
vips_image_init_fields( image, vips_image_init_fields( image,
gif->file->SWidth, gif->file->SHeight * gif->n, gif->file->SWidth, total_height,
(gif->has_colour ? 3 : 1) + (gif->has_transparency ? 1 : 0), (gif->has_colour ? 3 : 1) + (gif->has_transparency ? 1 : 0),
VIPS_FORMAT_UCHAR, VIPS_CODING_NONE, VIPS_FORMAT_UCHAR, VIPS_CODING_NONE,
gif->has_colour ? gif->has_colour ?