mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng17] Restored the old 1-million default limit on rows and columns

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2014-12-24 08:28:30 -06:00
parent d92b0f23e6
commit 13f025c29a
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libpng-manual.txt
View File

@ -648,7 +648,7 @@ User limits
The PNG specification allows the width and height of an image to be as
large as 2^31-1 (0x7fffffff), or about 2.147 billion rows and columns.
Since very few applications really need to process such large images,
we have imposed an arbitrary 640000 limit on rows and columns.
we have imposed an arbitrary 1,000,000 limit on rows and columns.
Larger images will be rejected immediately with a png_error() call. If
you wish to change this limit, you can use
@ -5111,11 +5111,11 @@ and safe limits are used by default (users who need larger limits
can still override them at compile time or run time, as described above).
The new limits are
default
png_user_width_max 640,000
png_user_height_max 640,000
png_user_chunk_cache_max 128
png_user_chunk_malloc_max 8,000,000
default spec limit
png_user_width_max 1,000,000 2,147,483,647
png_user_height_max 1,000,000 2,147,483,647
png_user_chunk_cache_max 128 unlimited
png_user_chunk_malloc_max 8,000,000 unlimited
XIII. Changes to Libpng from version 1.6.x to 1.7.x

12
libpng.3
View File

@ -1142,7 +1142,7 @@ callback function:
The PNG specification allows the width and height of an image to be as
large as 2^(31\-1 (0x7fffffff), or about 2.147 billion rows and columns.
Since very few applications really need to process such large images,
we have imposed an arbitrary 640000 limit on rows and columns.
we have imposed an arbitrary 1,000,000 limit on rows and columns.
Larger images will be rejected immediately with a png_error() call. If
you wish to change this limit, you can use
@ -5605,11 +5605,11 @@ and safe limits are used by default (users who need larger limits
can still override them at compile time or run time, as described above).
The new limits are
default
png_user_width_max 640,000
png_user_height_max 640,000
png_user_chunk_cache_max 128
png_user_chunk_malloc_max 8,000,000
default spec limit
png_user_width_max 1,000,000 2,147,483,647
png_user_height_max 1,000,000 2,147,483,647
png_user_chunk_cache_max 128 unlimited
png_user_chunk_malloc_max 8,000,000 unlimited
.SH XIII. Changes to Libpng from version 1.6.x to 1.7.x

6
pngusr.dfa
View File

@ -9,7 +9,7 @@
# appropriate values as #defines preceded by '@' (to cause them
# to be passed through to the build of pnglibconf.h), for example:
#
# @# define PNG_USER_WIDTH_MAX 1000000
# @# define PNG_USER_HEIGHT_MAX 1000000
# @# define PNG_USER_WIDTH_MAX 65535
# @# define PNG_USER_HEIGHT_MAX 65535
# @# define PNG_USER_CHUNK_CACHE_MAX 256
# @# define PNG_USER_CHUNK_MALLOC_MAX 4000000
# @# define PNG_USER_CHUNK_MALLOC_MAX 1000000

4
scripts/pnglibconf.dfa
View File

@ -393,8 +393,8 @@ option USER_LIMITS requires READ
#
# Only chunks that are variable in number are counted towards the
# USER_CHUNK_CACHE_MAX limit
setting USER_WIDTH_MAX default 640000 /* PNG max is 0x7fffffff */
setting USER_HEIGHT_MAX default 640000 /* PNG max is 0x7fffffff */
setting USER_WIDTH_MAX default 1000000 /* Use 0x7fffffff for unlimited */
setting USER_HEIGHT_MAX default 1000000 /* Use 0x7fffffff for unlimited */
setting USER_CHUNK_CACHE_MAX default 128 /* Use 0 for unlimited */
setting USER_CHUNK_MALLOC_MAX default 8000000 /* Use 0 for unlimited */

4
scripts/pnglibconf.h.prebuilt
View File

@ -198,8 +198,8 @@
#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
#define PNG_USER_CHUNK_CACHE_MAX 128 /* Use 0 for unlimited */
#define PNG_USER_CHUNK_MALLOC_MAX 8000000 /* Use 0 for unlimited */
#define PNG_USER_HEIGHT_MAX 640000 /* PNG max is 0x7fffffff */
#define PNG_USER_WIDTH_MAX 640000 /* PNG max is 0x7fffffff */
#define PNG_USER_HEIGHT_MAX 1000000 /* Use 0x7fffffff for unlimited */
#define PNG_USER_WIDTH_MAX 1000000 /* Use 0x7fffffff for unlimited */
#define PNG_WEIGHT_SHIFT 8
#define PNG_ZBUF_SIZE 8192
#define PNG_ZLIB_HEADER <zlib.h>