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] Removed extraneous PNG_SAFE_LIMITS_SUPPORTED handling from pngconf.h

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2014-12-23 14:10:30 -06:00
parent 310ffb25f8
commit caa59e0007
4 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.7.0beta44 - December 22, 2014 Libpng 1.7.0beta44 - December 23, 2014
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -665,11 +665,12 @@ Version 1.7.0beta43 [December 18, 2014]
renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler). renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler).
Quiet a "comparison always true" warning in pngstest.c (John Bowler). Quiet a "comparison always true" warning in pngstest.c (John Bowler).
Version 1.7.0beta44 [December 22, 2014] Version 1.7.0beta44 [December 23, 2014]
Restored a test on width that was removed from png.c at libpng-1.6.9 Restored a test on width that was removed from png.c at libpng-1.6.9
(Bug report by Alex Eubanks). (Bug report by Alex Eubanks).
Fixed an overflow in png_combine_row with very wide interlaced images. Fixed an overflow in png_combine_row with very wide interlaced images.
Corrected the width limit calculation in png_check_IHDR(). Corrected the width limit calculation in png_check_IHDR().
Removed extraneous handling of PNG_SAFE_LIMITS_SUPPORTED from pngconf.h
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

3
CHANGES
View File

@ -4954,11 +4954,12 @@ Version 1.7.0beta43 [December 18, 2014]
renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler). renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler).
Quiet a "comparison always true" warning in pngstest.c (John Bowler). Quiet a "comparison always true" warning in pngstest.c (John Bowler).
Version 1.7.0beta44 [December 22, 2014] Version 1.7.0beta44 [December 23, 2014]
Restored a test on width that was removed from png.c at libpng-1.6.9 Restored a test on width that was removed from png.c at libpng-1.6.9
(Bug report by Alex Eubanks). (Bug report by Alex Eubanks).
Fixed an overflow in png_combine_row with very wide interlaced images. Fixed an overflow in png_combine_row with very wide interlaced images.
Corrected the width limit calculation in png_check_IHDR(). Corrected the width limit calculation in png_check_IHDR().
Removed extraneous handling of PNG_SAFE_LIMITS_SUPPORTED from pngconf.h
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

22
pngconf.h
View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng /* pngconf.h - machine configurable file for libpng
* *
* libpng version 1.7.0beta44 - December 18, 2014 * libpng version 1.7.0beta44 - December 23, 2014
* *
* Copyright (c) 1998-2013 Glenn Randers-Pehrson * Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -22,26 +22,6 @@
#ifndef PNGCONF_H #ifndef PNGCONF_H
#define PNGCONF_H #define PNGCONF_H
/* To do: Do all of this in scripts/pnglibconf.dfa */
#ifdef PNG_SAFE_LIMITS_SUPPORTED
# ifdef PNG_USER_WIDTH_MAX
# undef PNG_USER_WIDTH_MAX
# define PNG_USER_WIDTH_MAX 1000000L
# endif
# ifdef PNG_USER_HEIGHT_MAX
# undef PNG_USER_HEIGHT_MAX
# define PNG_USER_HEIGHT_MAX 1000000L
# endif
# ifdef PNG_USER_CHUNK_MALLOC_MAX
# undef PNG_USER_CHUNK_MALLOC_MAX
# define PNG_USER_CHUNK_MALLOC_MAX 4000000L
# endif
# ifdef PNG_USER_CHUNK_CACHE_MAX
# undef PNG_USER_CHUNK_CACHE_MAX
# define PNG_USER_CHUNK_CACHE_MAX 128
# endif
#endif
#ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */ #ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */
/* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C /* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C

10
pngpriv.h
View File

@ -357,24 +357,24 @@
#ifdef PNG_SAFE_LIMITS_SUPPORTED #ifdef PNG_SAFE_LIMITS_SUPPORTED
/* 'safe' limits */ /* 'safe' limits */
# ifndef PNG_USER_WIDTH_MAX # ifndef PNG_USER_WIDTH_MAX
# define PNG_USER_WIDTH_MAX 1000000 # define PNG_USER_WIDTH_MAX 1000000L
# endif # endif
# ifndef PNG_USER_HEIGHT_MAX # ifndef PNG_USER_HEIGHT_MAX
# define PNG_USER_HEIGHT_MAX 1000000 # define PNG_USER_HEIGHT_MAX 1000000L
# endif # endif
# ifndef PNG_USER_CHUNK_CACHE_MAX # ifndef PNG_USER_CHUNK_CACHE_MAX
# define PNG_USER_CHUNK_CACHE_MAX 128 # define PNG_USER_CHUNK_CACHE_MAX 128
# endif # endif
# ifndef PNG_USER_CHUNK_MALLOC_MAX # ifndef PNG_USER_CHUNK_MALLOC_MAX
# define PNG_USER_CHUNK_MALLOC_MAX 8000000 # define PNG_USER_CHUNK_MALLOC_MAX 8000000L
# endif # endif
#else #else
/* values for no limits */ /* values for no limits */
# ifndef PNG_USER_WIDTH_MAX # ifndef PNG_USER_WIDTH_MAX
# define PNG_USER_WIDTH_MAX 0x7fffffff # define PNG_USER_WIDTH_MAX 0x7fffffffL
# endif # endif
# ifndef PNG_USER_HEIGHT_MAX # ifndef PNG_USER_HEIGHT_MAX
# define PNG_USER_HEIGHT_MAX 0x7fffffff # define PNG_USER_HEIGHT_MAX 0x7fffffffL
# endif # endif
# ifndef PNG_USER_CHUNK_CACHE_MAX # ifndef PNG_USER_CHUNK_CACHE_MAX
# define PNG_USER_CHUNK_CACHE_MAX 0 # define PNG_USER_CHUNK_CACHE_MAX 0