Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit f53c113

Browse files
committed
Bug 1491467 - Update libpng to 1.6.35. r=aosmond
Differential Revision: https://phabricator.services.mozilla.com/D5913 --HG-- extra : moz-landing-system : lando
1 parent c9db005 commit f53c113

28 files changed

Lines changed: 1968 additions & 1910 deletions

media/libpng/CHANGES

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if 0
21
CHANGES - changes for libpng
32

43
version 0.1 [March 29, 1995]
@@ -1454,7 +1453,7 @@ Version 1.2.6beta4 [July 28, 2004]
14541453
sequential read support.
14551454
Added some "#if PNG_WRITE_SUPPORTED" blocks.
14561455
Added #ifdef to remove some redundancy in png_malloc_default().
1457-
Use png_malloc instead of png_zalloc to allocate the pallete.
1456+
Use png_malloc instead of png_zalloc to allocate the palette.
14581457

14591458
Version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]
14601459
Fixed buffer overflow vulnerability (CVE-2004-0597) in png_handle_tRNS().
@@ -3259,7 +3258,7 @@ Version 1.5.2beta01 [February 13, 2011]
32593258
Revised PNG_EXPORTA macro to not use an empty parameter, to accommodate the
32603259
old VisualC++ preprocessor.
32613260
Turned on interlace handling in png_read_png().
3262-
Fixed gcc pendantic warnings.
3261+
Fixed gcc pedantic warnings.
32633262
Handle longjmp in Cygwin.
32643263
Fixed png_get_current_row_number() in the interlaced case.
32653264
Cleaned up ALPHA flags and transformations.
@@ -3359,7 +3358,7 @@ Version 1.5.3beta05 [May 6, 2011]
33593358
Pass "" instead of '\0' to png_default_error() in png_err(). This mistake
33603359
was introduced in libpng-1.2.20beta01. This fixes CVE-2011-2691.
33613360
Added PNG_WRITE_OPTIMIZE_CMF_SUPPORTED macro to make the zlib "CMF" byte
3362-
optimization configureable.
3361+
optimization configurable.
33633362
IDAT compression failed if preceded by a compressed text chunk (bug
33643363
introduced in libpng-1.5.3beta01-02). This was because the attempt to
33653364
reset the zlib stream in png_write_IDAT happened after the first IDAT
@@ -3643,7 +3642,7 @@ Version 1.5.6beta05 [October 12, 2011]
36433642
Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6beta01.
36443643

36453644
Version 1.5.6beta06 [October 17, 2011]
3646-
Removed two redundant tests for unitialized row.
3645+
Removed two redundant tests for uninitialized row.
36473646
Fixed a relatively harmless memory overwrite in compressed text writing
36483647
with a 1 byte zlib buffer.
36493648
Add ability to call png_read_update_info multiple times to pngvalid.c.
@@ -3689,7 +3688,7 @@ Version 1.5.7beta01 [November 4, 2011]
36893688
crash. The pngmem.c implementation of png_malloc() included a cast
36903689
to png_size_t which would fail on large allocations on 16-bit systems.
36913690
Fix for the preprocessor of the Intel C compiler. The preprocessor
3692-
splits adjacent @ signs with a space; this changes the concatentation
3691+
splits adjacent @ signs with a space; this changes the concatenation
36933692
token from @-@-@ to PNG_JOIN; that should work with all compiler
36943693
preprocessors.
36953694
Paeth filter speed improvements from work by Siarhei Siamashka. This
@@ -3735,7 +3734,7 @@ Version 1.5.7beta03 [November 17, 2011]
37353734
gray (on palette) itself.
37363735
Fixes for C++ compilation using g++ When libpng source is compiled
37373736
using g++. The compiler imposes C++ rules on the C source; thus it
3738-
is desireable to make the source work with either C or C++ rules
3737+
is desirable to make the source work with either C or C++ rules
37393738
without throwing away useful error information. This change adds
37403739
png_voidcast to allow C semantic (void*) cases or the corresponding
37413740
C++ static_cast operation, as appropriate.
@@ -4061,7 +4060,7 @@ Version 1.6.0beta17 [March 10, 2012]
40614060
possible to call png_inflate() incrementally. A warning is no longer
40624061
issued if the language tag or translated keyword in the iTXt chunk
40634062
has zero length.
4064-
If benign errors are disabled use maximum window on ancilliary inflate.
4063+
If benign errors are disabled use maximum window on ancillary inflate.
40654064
This works round a bug introduced in 1.5.4 where compressed ancillary
40664065
chunks could end up with a too-small windowBits value in the deflate
40674066
header.
@@ -4176,7 +4175,7 @@ Version 1.6.0beta27 [August 11, 2012]
41764175
declared even though the functions are never actually defined. This
41774176
change provides a dummy definition so that the declarations work, yet any
41784177
implementation will fail to compile because of an incomplete type.
4179-
Re-eliminated the use of strcpy() in pngtest.c. An unncessary use of
4178+
Re-eliminated the use of strcpy() in pngtest.c. An unnecessary use of
41804179
strcpy() was accidentally re-introduced in libpng16; this change replaces
41814180
it with strncpy().
41824181
Eliminated use of png_sizeof(); use sizeof() instead.
@@ -4309,7 +4308,7 @@ Version 1.6.0beta31 [November 1, 2012]
43094308
resulting in VS2010 having to update the files.
43104309
Removed non-working ICC profile support code that was mostly added to
43114310
libpng-1.6.0beta29 and beta30. There was too much code for too little
4312-
gain; implementing full ICC color correction may be desireable but is left
4311+
gain; implementing full ICC color correction may be desirable but is left
43134312
up to applications.
43144313

43154314
Version 1.6.0beta32 [November 25, 2012]
@@ -4592,7 +4591,7 @@ Version 1.6.3beta07 [June 8, 2013]
45924591
the optimizations ('check' vs 'api') are exposed in the public header files
45934592
except that the new setting PNG_ARM_NEON_OPT documents how libpng makes the
45944593
decision about whether or not to use the optimizations.
4595-
Protect symbol prefixing against CC/CPPFLAGS/CFLAGS useage.
4594+
Protect symbol prefixing against CC/CPPFLAGS/CFLAGS usage.
45964595
Previous iOS/Xcode fixes for the ARM NEON optimizations moved the test
45974596
on __ARM_NEON__ from configure time to compile time. This breaks symbol
45984597
prefixing because the definition of the special png_init_filter_functions
@@ -5635,7 +5634,7 @@ Version 1.6.24beta02 [June 23, 2016]
56355634
to All and adds a list of the warnings that need to be turned off. This is
56365635
semi-documentary; the intent is to tell libpng users which warnings have
56375636
been examined and judged non-fixable at present. The warning about
5638-
structure padding is fixable, but it would be a signficant change (moving
5637+
structure padding is fixable, but it would be a significant change (moving
56395638
structure members around).
56405639

56415640
Version 1.6.24beta03 [July 4, 2016]
@@ -5781,7 +5780,7 @@ Version 1.6.28rc01 [January 3, 2017]
57815780
Added option to Cmake build allowing a custom location of zlib to be
57825781
specified in a scenario where libpng is being built as a subproject
57835782
alongside zlib by another project (Sam Serrels).
5784-
Changed png_ptr->options from a png_byte to png_uint_32, to accomodate
5783+
Changed png_ptr->options from a png_byte to png_uint_32, to accommodate
57855784
up to 16 options.
57865785

57875786
Version 1.6.28rc02 [January 4, 2017]
@@ -5932,7 +5931,7 @@ Version 1.6.32beta04 [August 2, 2017]
59325931
Update libpng.3 and libpng-manual.txt about eXIf functions.
59335932

59345933
Version 1.6.32beta05 [August 2, 2017]
5935-
Restored png_get_eXIf() and png_set_eXIf() to maintain API compatability.
5934+
Restored png_get_eXIf() and png_set_eXIf() to maintain API compatibility.
59365935

59375936
Version 1.6.32beta06 [August 2, 2017]
59385937
Removed png_get_eXIf_1() and png_set_eXIf_1().
@@ -6038,14 +6037,35 @@ Version 1.6.33 [September 28, 2017]
60386037
Add end_info structure and png_read_end() to the libpng fuzzer.
60396038

60406039
Version 1.6.34 [September 29, 2017]
6041-
Removed contrib/pngsuite/i*.png; some of these were incorrect and caused
6042-
test failures.
6040+
Removed contrib/pngsuite/i*.png; some of them caused test failures.
6041+
6042+
Version 1.6.35beta01 [March 6, 2018]
6043+
Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
6044+
failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
6045+
Added calls to png_set_*() transforms commonly used by browsers to
6046+
the fuzzer.
6047+
Removed some unnecessary brackets in pngrtran.c
6048+
Fixed miscellaneous typos (Patch by github user "luzpaz").
6049+
Change "ASM C" to "C ASM" in CMakeLists.txt
6050+
Fixed incorrect handling of bKGD chunk in sub-8-bit files (Cosmin)
6051+
Added hardware optimization directories to zip and 7z distributions.
6052+
Fixed incorrect bitmask for options.
6053+
Fixed many spelling typos.
6054+
6055+
Version 1.6.35beta02 [March 28, 2018]
6056+
Make png_get_iCCP consistent with man page (allow compression-type argument
6057+
to be NULL, bug report by Lenard Szolnoki).
6058+
6059+
Version 1.6.35 [July 15, 2018]
6060+
Replaced the remaining uses of png_size_t with size_t (Cosmin)
6061+
Fixed the calculation of row_factor in png_check_chunk_length
6062+
(reported by Thuan Pham in SourceForge issue #278)
6063+
Added missing parentheses to a macro definition
6064+
(suggested by "irwir" in GitHub issue #216)
60436065

60446066
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
60456067
(subscription required; visit
60466068
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
6047-
to subscribe)
6048-
or to glennrp at users.sourceforge.net
6069+
to subscribe).
60496070

60506071
Glenn R-P
6051-
#endif

media/libpng/LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ surrounding them in the modified libpng source files.
2020

2121
This code is released under the libpng license.
2222

23-
libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are
24-
Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
23+
libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
24+
Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
2525
derived from libpng-1.0.6, and are distributed according to the same
2626
disclaimer and license as libpng-1.0.6 with the following individuals
2727
added to the list of Contributing Authors:
@@ -140,4 +140,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and
140140

141141
Glenn Randers-Pehrson
142142
glennrp at users.sourceforge.net
143-
September 29, 2017
143+
July 15, 2018

media/libpng/MOZCHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
Changes made to pristine libpng source by mozilla.org developers.
33

4+
2018/09/14 -- Synced with libpng-1.6.35 (bug #1491467).
5+
46
2017/08/30 -- Synced with libpng-1.6.34 (bug #1402057).
57

68
2017/03/18 -- Synced with libpng-1.6.31 (bug #1377118).

media/libpng/README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README for libpng version 1.6.34 - September 29, 2017 (shared library 16.0)
1+
README for libpng version 1.6.35 - July 15, 2018 (shared library 16.0)
22
See the note about version numbers near the top of png.h
33

44
See INSTALL for instructions on how to install libpng.
@@ -118,7 +118,7 @@ development group.
118118
Send comments/corrections/commendations to png-mng-implement at
119119
lists.sourceforge.net (subscription required; visit
120120
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
121-
to subscribe) or to glennrp at users.sourceforge.net
121+
to subscribe).
122122

123123
You can't reach Guy, the original libpng author, at the addresses
124124
given in previous versions of this document. He and Andreas will

0 commit comments

Comments
 (0)