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

Merge branch '8.9'

Browse Source
This commit is contained in:
John Cupitt 2020-02-02 11:15:09 +00:00
commit 05a45c3418
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -10,6 +10,7 @@
31/1/19 started 8.9.2 31/1/19 started 8.9.2
- fix a deadlock with --vips-leak [DarthSim] - fix a deadlock with --vips-leak [DarthSim]
- better gifload behaviour for DISPOSAL_UNSPECIFIED [DarthSim] - better gifload behaviour for DISPOSAL_UNSPECIFIED [DarthSim]
- ban ppm max_value < 0
20/6/19 started 8.9.1 20/6/19 started 8.9.1
- don't use the new source loaders for new_from_file or new_from_buffer, it - don't use the new source loaders for new_from_file or new_from_buffer, it

8
libvips/foreign/ppmload.c
View File

@ -35,6 +35,8 @@
* - redone with source/target * - redone with source/target
* - sequential load, plus mmap for filename sources * - sequential load, plus mmap for filename sources
* - faster plus lower memory use * - faster plus lower memory use
* 02/02/2020
* - ban max_vaue < 0
*/ */
/* /*
@ -259,6 +261,12 @@ vips_foreign_load_ppm_parse_header( VipsForeignLoadPpm *ppm )
if( get_int( ppm->sbuf, &ppm->max_value ) ) if( get_int( ppm->sbuf, &ppm->max_value ) )
return( -1 ); return( -1 );
/* max_value must be > 0 and <= 65535, according to
* the spec, but we allow up to 32 bits per pixel.
*/
if( ppm->max_value < 0 )
ppm->max_value = 0;
if( ppm->max_value > 255 ) if( ppm->max_value > 255 )
ppm->bits = 16; ppm->bits = 16;
if( ppm->max_value > 65535 ) if( ppm->max_value > 65535 )