Commit Graph

1306 Commits

Author SHA1 Message Date
Viktor Szakats
8c50acb9d2 silence clang -Wcomma warnings 2017-03-29 23:54:40 +00:00
Glenn Randers-Pehrson
03a6f3f9c9 [libpng16] Bump version to 1.6.30beta01 2017-03-16 10:40:01 -05:00
Glenn Randers-Pehrson
d42e88d5b3 [libpng16] Imported from libpng-1.6.29.tar 2017-03-16 07:26:33 -05:00
Glenn Randers-Pehrson
fae874c8ca [libpng16] Imported from libpng-1.6.29rc01.tar 2017-03-08 17:08:36 -06:00
Glenn Randers-Pehrson
0b1f7e412b [libpng16] Bump version to 1.6.29beta04 2017-03-01 07:15:58 -06:00
Glenn Randers-Pehrson
7db98a18fe [libpng16] Suppress clang warnings about implicit sign changes in png.c 2017-03-01 07:09:05 -06:00
Glenn Randers-Pehrson
862a2858b0 [libpng16] Bump version to 1.6.29beta03 2017-02-22 14:41:30 -06:00
Glenn Randers-Pehrson
364450bf8d [libpng16] Imported from libpng-1.6.29beta02.tar 2017-02-22 14:34:14 -06:00
Glenn Randers-Pehrson
ae794eefaa [libpng16] Bump version to 1.6.29beta02 2017-01-12 17:52:05 -06:00
Glenn Randers-Pehrson
8c6c9e6d56 [libpng16] Update credits to include Google Inc, for the Intel/SSE patch. 2017-01-12 09:45:02 -06:00
Glenn Randers-Pehrson
4ddac468c4 [libpng16] Bump version to 1.6.29beta01 2017-01-05 11:37:54 -06:00
Glenn Randers-Pehrson
17ad597dba [libpng16] Imported from libpng-1.6.28.tar 2017-01-05 07:59:36 -06:00
Glenn Randers-Pehrson
93b3476358 [libpng16] Imported from libpng-1.6.28rc03.tar 2017-01-03 22:25:10 -06:00
Glenn Randers-Pehrson
3785125faf [libpng16] Imported from libpng-1.6.28rc02.tar 2017-01-03 19:23:10 -06:00
Glenn Randers-Pehrson
24dfd3f2d7 [libpng16] Imported from libpng-1.6.28rc01.tar 2017-01-03 12:51:38 -06:00
Glenn Randers-Pehrson
f8bdbd4d8f [libpng16] Changed png_ptr->options from a png_byte to png_uint_32, to
accomodate up to 16 options.
2017-01-02 19:03:36 -06:00
Glenn Randers-Pehrson
b9b490c7f5 [libpng16] Bump version to 1.6.28beta01 2016-12-30 08:29:24 -06:00
Glenn Randers-Pehrson
812768d7a9 [libpng16] Fixed a potential null pointer dereference in png_set_text_2()
(bug report and patch by Patrick Keshishian).
2016-12-29 07:52:27 -06:00
Glenn Randers-Pehrson
a3b5edc934 [libpng16] Bump version to 1.6.27 2016-12-29 07:50:33 -06:00
Glenn Randers-Pehrson
61a9a054fd [libpng16] Imported from libpng-1.6.27rc01.tar 2016-12-27 08:24:22 -06:00
Glenn Randers-Pehrson
dbb5fce3d8 [libpng16] Control ADLER32 checking with new PNG_IGNORE_ADLER32 option. 2016-12-26 18:00:46 -06:00
Glenn Randers-Pehrson
a69dd76eac [libpng16] Bump version to 1.6.27beta02 2016-11-02 17:54:15 -05:00
Glenn Randers-Pehrson
e36003e9b8 [libpng16] Imported from libpng-1.6.27beta01.tar 2016-11-02 17:37:21 -05:00
Glenn Randers-Pehrson
858cb585d7 [libpng16] Bump version to 1.6.27beta01 2016-10-28 15:25:26 -05:00
Glenn Randers-Pehrson
0c440812db [libpng16] Imported from libpng-1.6.26.tar 2016-10-19 19:11:38 -05:00
Glenn Randers-Pehrson
a1312f7b19 [libpng16] Cosmetic change "ptr != 0" to "ptr != NULL" in png.c and pngrutil.c 2016-10-16 14:34:40 -05:00
Glenn Randers-Pehrson
01e99bbac1 [libpng16] Imported from libpng-1.6.26rc01.tar 2016-10-12 08:16:13 -05:00
Glenn Randers-Pehrson
dd6d7f031f [libpng16] Bump version to 1.6.26beta07 2016-10-07 15:57:32 -05:00
Glenn Randers-Pehrson
f7fe4db91b [libpng16] Imported from libpng-1.6.26beta06.tar 2016-10-07 15:57:10 -05:00
Glenn Randers-Pehrson
ffaeff82d3 [libpng16] Bump version to 1.6.26beta06 2016-10-05 19:43:55 -05:00
Glenn Randers-Pehrson
13bdd8bcdf [libpng16] Imported from libpng-1.6.26beta05.tar 2016-10-05 19:43:35 -05:00
Glenn Randers-Pehrson
b3540f9932 [libpng16] Bump version to 1.6.26beta05 2016-10-03 12:31:18 -05:00
Glenn Randers-Pehrson
b7b59b7fe9 [libpng16] Bump version to 1.6.26beta04 2016-10-02 19:18:29 -05:00
Glenn Randers-Pehrson
3875d9af4c [libpng16] Quieted 45 (out of 86 remaining) -Wconversion compiler warnings 2016-10-02 17:08:46 -05:00
Glenn Randers-Pehrson
ad3318ddc8 [libpng16] Bump version to 1.6.26beta03 2016-10-01 19:44:42 -05:00
Glenn Randers-Pehrson
7184475a98 [libpng16] Imported from libpng-1.6.26beta02.tar 2016-10-01 19:44:32 -05:00
Glenn Randers-Pehrson
1b363fa6b0 [libpng16] Quieted 116 (out of 288) -Wconversion compiler warnings by changing
flag definitions in pngpriv.h from 0xnnnn to 0xnnnnU and trivial changes
in png.c, pngread.c, and pngwutil.c.
2016-09-30 17:19:12 -05:00
Glenn Randers-Pehrson
394be58371 [libpng16] Bump version to 1.6.26beta02 2016-09-26 08:58:04 -05:00
Glenn Randers-Pehrson
217546ae43 [libpng16] Imported from libpng-1.6.26beta01.tar 2016-09-26 08:57:44 -05:00
Glenn Randers-Pehrson
c9d7b865b6 [libpng16] Bump version to 1.6.26beta01 2016-08-31 23:19:25 -05:00
Glenn Randers-Pehrson
e3a6631123 [libpng16] Imported from libpng-1.6.25.tar 2016-08-31 22:30:47 -05:00
Glenn Randers-Pehrson
434aecf327 [libpng16] Bump version to 1.6.25rc06 2016-08-30 11:21:11 -05:00
Glenn Randers-Pehrson
42e5441888 [libpng16] Bump version to 1.6.25rc05 2016-08-30 10:46:51 -05:00
Glenn Randers-Pehrson
01b6ca34b7 [libpng16] Imported from libpng-1.6.25rc04.tar 2016-08-30 10:46:43 -05:00
Glenn Randers-Pehrson
2e2330bf25 [libpng16] Bump version to 1.6.25rc04 2016-08-29 16:15:28 -05:00
Glenn Randers-Pehrson
000f07bfbe [libpng16] Bump version to 1.6.25rc03 2016-08-29 10:57:26 -05:00
Glenn Randers-Pehrson
2e7c3a6e70 [libpng16] Imported from libpng-1.6.25rc02.tar 2016-08-29 10:45:13 -05:00
Glenn Randers-Pehrson
143434ac78 [libpng16] Bump version to 1.6.25beta03 2016-08-18 12:23:08 -05:00
Glenn Randers-Pehrson
4dc4b2efac [libpng16] Imported from libpng-1.6.25beta02.tar 2016-08-18 12:17:31 -05:00
Glenn Randers-Pehrson
2705f55221 [libpng16] Bump version to 1.6.25beta02 2016-08-12 07:05:46 -05:00
Glenn Randers-Pehrson
4679be7c2b [libpng16] Imported from libpng-1.6.25beta01.tar 2016-08-12 07:00:44 -05:00
Glenn Randers-Pehrson
e018ab98be Merge branch 'libpng16' of git://github.com/jbowler/libpng into libpng16 2016-08-10 20:49:48 -05:00
John Bowler
92a7c79db2 [libpng16] Reject oversized iCCP profile length
The code now validates the ICC profile length against the user chunk limit
before the buffer is allocated, as opposed to doing it while the buffer is read.

This removes the potential to consume virtual address space with a carefully
crafted ICC profile; only an issue on 32-bit systems where a valid profile can
be up to 2^32-4 bytes in length.  libpng never writes beyond the application
supplied limit, but previously it did allocate a buffer of the size specified in
the profile header.  The exploitability of this is almost zero; the address
space is released as soon as the PNG read completes.

Also clean up PNG_DEBUG compile of pngtest.c.

Signed-off-by: John Bowler <jbowler@acm.org>
2016-08-10 15:35:09 -07:00
Glenn Randers-Pehrson
cdc0e74ee6 [libpng16] Bump version to 1.6.25beta01 2016-08-03 21:59:27 -05:00
Glenn Randers-Pehrson
b50d5cea2b [libpng16] Imported from libpng-1.6.24.tar 2016-08-03 21:32:26 -05:00
Glenn Randers-Pehrson
3d3c23b39f [libpng16] Bump version to 1.6.24rc04 2016-08-02 12:58:15 -05:00
Glenn Randers-Pehrson
2bb9ee89fa [libpng16] Imported from libpng-1.6.24rc03.tar 2016-08-02 12:58:07 -05:00
Glenn Randers-Pehrson
99663e95f8 [libpng16] Bump version to 1.6.24rc03 2016-08-01 18:00:51 -05:00
Glenn Randers-Pehrson
1153ddccb6 [libpng16] Imported from libpng-1.6.24rc02.tar 2016-08-01 18:00:40 -05:00
Glenn Randers-Pehrson
faa3e537e1 [libpng16] Imported from libpng-1.6.24rc01.tar 2016-07-25 07:53:38 -05:00
Glenn Randers-Pehrson
d1f9149d8a [libpng16] Bump version to 1.6.24beta07 2016-07-19 17:01:50 -05:00
Glenn Randers-Pehrson
ee079481c9 [libpng16] Imported from libpng-1.6.24beta06.tar 2016-07-19 17:00:00 -05:00
Glenn Randers-Pehrson
dd70604cec [libpng16] Fixed more indentation 2016-07-15 11:20:46 -05:00
Glenn Randers-Pehrson
baed0e32f9 [libpng16] Bump version to 1.6.24beta06 2016-07-14 09:55:45 -05:00
Glenn Randers-Pehrson
0fd9a249de [libpng16] Update "last changed" dates 2016-07-13 16:29:22 -05:00
Glenn Randers-Pehrson
192e92d681 [libpng16] Fixed some indentation to comply with our coding style. 2016-07-13 14:43:42 -05:00
Glenn Randers-Pehrson
1b9f4817c8 [libpng16] Bump version to 1.6.24beta05 2016-07-08 10:14:50 -05:00
Glenn Randers-Pehrson
d9940f6207 [libpng16] Imported from libpng-1.6.24beta04.tar 2016-07-08 10:14:42 -05:00
Glenn Randers-Pehrson
9928ee0a52 [libpng16] Bump version to 1.6.24beta04 2016-07-04 09:55:49 -05:00
Glenn Randers-Pehrson
66f796e74c [libpng16] Imported from libpng-1.6.24beta03.tar 2016-07-04 09:55:12 -05:00
Glenn Randers-Pehrson
2c21a4778d [libpng16] Relocated misplaced #endif in png.c sRGB profile checking. 2016-07-02 21:17:56 -05:00
Glenn Randers-Pehrson
d43f93ff93 [libpng16] Bump version to 1.6.24beta03 2016-06-23 11:27:12 -05:00
Glenn Randers-Pehrson
3f2879bf60 [libpng16] Imported from libpng-1.6.24beta02.tar 2016-06-23 11:26:59 -05:00
Glenn Randers-Pehrson
ee1e535298 [libpng16] Bump version to 1.6.24beta03 2016-06-23 11:08:14 -05:00
Glenn Randers-Pehrson
4b4a9583b4 [libpng16] Imported from libpng-1.6.24beta02.tar 2016-06-23 11:08:06 -05:00
Glenn Randers-Pehrson
4a8105e925 [libpng16] Bump version to 1.6.24beta02 2016-06-11 18:07:44 -05:00
Glenn Randers-Pehrson
428f5ddabd [libpng16] Bump version to 1.6.24beta01 2016-06-11 14:10:03 -05:00
Glenn Randers-Pehrson
ed6db9d86b [libpng16] Imported from libpng-1.6.23.tar 2016-06-09 06:49:42 -05:00
Glenn Randers-Pehrson
6d4e4d0cce [libpng16] Imported from libpng-1.6.23rc02.tar 2016-06-03 21:28:20 -05:00
Glenn Randers-Pehrson
1fdac25f66 [libpng16] Imported from libpng-1.6.23rc01.tar 2016-06-01 19:17:57 -05:00
Glenn Randers-Pehrson
a201f859cd [libpng16] Bump version to 1.6.23beta02 2016-05-29 09:52:31 -05:00
Glenn Randers-Pehrson
84cc738166 [libpng16] Imported from libpng-1.6.23beta01.tar 2016-05-29 09:47:30 -05:00
Glenn Randers-Pehrson
4e34fd3b8a [libpng16] Bump version to 1.6.23beta01 2016-05-27 19:48:24 -05:00
Glenn Randers-Pehrson
ac43a87820 [libpng16] Imported from libpng-1.6.22.tar 2016-05-26 07:25:14 -05:00
Glenn Randers-Pehrson
474751e6b2 [libpng16] Bump version to 1.6.22rc04 2016-05-18 07:32:07 -05:00
Glenn Randers-Pehrson
37ab4d946c [libpng16] Imported from libpng-1.6.22rc03.tar 2016-05-18 07:26:06 -05:00
Glenn Randers-Pehrson
add4581894 [libpng16] Imported from libpng-1.6.22rc02.tar 2016-05-16 16:18:48 -05:00
Glenn Randers-Pehrson
f6ca49c863 [libpng16] Imported from libpng-1.6.22rc01.tar 2016-05-14 09:47:55 -05:00
Glenn Randers-Pehrson
7fa1b5b26c [libpng16] Bump version to 1.6.22beta07 2016-05-05 19:38:04 -05:00
Glenn Randers-Pehrson
0794fee913 [libpng16] Imported from libpng-1.6.22beta06.tar 2016-05-05 19:37:54 -05:00
Glenn Randers-Pehrson
830608b4b8 [libpng16] Bump version to 1.6.22beta06 2016-04-27 13:01:29 -05:00
Glenn Randers-Pehrson
eefd9127ca [libpng16] Imported from libpng-1.6.22beta05.tar 2016-04-27 13:01:14 -05:00
Glenn Randers-Pehrson
daf2169797 [libpng16] Bump version to 1.6.22beta05 2016-04-05 19:38:42 -05:00
Glenn Randers-Pehrson
e0acad59cb [libpng16] Imported from libpng-1.6.22beta04.tar 2016-04-05 19:38:22 -05:00
Glenn Randers-Pehrson
edad4639cf [libpng16] Bump version to 1.6.22beta04 2016-03-09 12:04:48 -06:00
Glenn Randers-Pehrson
1a3fa1e091 [libpng16] Imported from libpng-1.6.22beta03.tar 2016-03-09 12:04:40 -06:00
Glenn Randers-Pehrson
461c7e45b5 [libpng16] Bump version to 1.6.22beta03 2016-02-08 17:13:14 -06:00
Glenn Randers-Pehrson
a4a54aa1bf [libpng16] Imported from libpng-1.6.22beta02.tar 2016-02-08 17:13:06 -06:00
Glenn Randers-Pehrson
e0ce90ea0a [libpng16] Bump version to 1.6.22beta02 2016-01-23 14:58:07 -06:00
Glenn Randers-Pehrson
f6a23fe205 [libpng16] Imported from libpng-1.6.22beta01.tar 2016-01-23 14:06:39 -06:00
Glenn Randers-Pehrson
5031c77d85 [libpng16] Bump version to 1.6.22beta01 2016-01-16 08:00:09 -06:00
Glenn Randers-Pehrson
fc0786a442 [libpng16] Imported from libpng-1.6.21.tar 2016-01-15 13:51:06 -06:00
Glenn Randers-Pehrson
253326c52d [libpng16] Deleted a left-over cut-and-paste line in png_get_copyright(). 2016-01-08 06:30:15 -06:00
Glenn Randers-Pehrson
81dfc2163b [libpng16] Imported from libpng-1.6.21rc02.tar 2016-01-07 09:31:16 -06:00
Glenn Randers-Pehrson
ecc022ee5f [libpng16] Bump version to libpng-1.6.21rc02.tar 2016-01-06 13:26:32 -06:00
Glenn Randers-Pehrson
092b8d7bf3 [libpng16] Imported from libpng-1.6.21rc01.tar 2016-01-04 08:24:14 -06:00
Glenn Randers-Pehrson
66db757dd4 [libpng16] Happy 2016! Updated copyright year 2016-01-02 13:40:27 -06:00
Glenn Randers-Pehrson
dea53bb460 [libpng16] Bump version to 1.6.21beta04 2015-12-19 10:48:20 -06:00
Glenn Randers-Pehrson
35a5a6c16d [libpng16] Imported from libpng-1.6.21beta03.tar 2015-12-19 10:48:12 -06:00
Glenn Randers-Pehrson
ad29c03711 [libpng16] Bump version to 1.6.21beta03 2015-12-13 23:24:36 -06:00
Glenn Randers-Pehrson
4d8de33979 [libpng16] Update copyright uears in source files. 2015-12-13 22:41:17 -06:00
Glenn Randers-Pehrson
f3da771890 [libpng16] Bump version to 1.6.21beta02 2015-12-11 19:21:01 -06:00
Glenn Randers-Pehrson
2edfd187f2 [libpng16] Imported from libpng-1.6.21beta01.tar 2015-12-11 16:39:54 -06:00
Glenn Randers-Pehrson
0de0101fdd [libpng16] Bump version to 1.6.21beta01 2015-12-08 22:19:15 -06:00
Glenn Randers-Pehrson
5b6a6f914b [libpng16] Imported from libpng-1.6.20.tar 2015-12-02 22:30:37 -06:00
Glenn Randers-Pehrson
030e12ec39 [libpng16] Bump version to libpng-1.6.20rc02.tar 2015-11-29 16:10:46 -06:00
Glenn Randers-Pehrson
e7092bc59c [libpng16] Imported from libpng-1.6.20rc01.tar 2015-11-26 07:04:24 -06:00
Glenn Randers-Pehrson
92ec30a3b1 [libpng16] Imported from libpng-1.6.20beta03.tar 2015-11-24 09:34:02 -06:00
Glenn Randers-Pehrson
9a2065c5ee [libpng16] Imported from libpng-1.6.20beta02.tar 2015-11-23 09:29:44 -06:00
Glenn Randers-Pehrson
a1a2ae2a25 [libpng16] Bump version to 1.6.20beta02 2015-11-22 14:11:29 -06:00
Glenn Randers-Pehrson
26942c818e [libpng16] Imported from libpng-1.6.20beta01.tar 2015-11-22 14:08:52 -06:00
Glenn Randers-Pehrson
f1cdf4e1ca [libpng16] Bump version to 1.6.20beta01 2015-11-13 10:18:18 -06:00
Glenn Randers-Pehrson
415d26805a [libpng16] Imported from libpng-1.6.19.tar 2015-11-12 07:13:31 -06:00
Glenn Randers-Pehrson
64fef09b67 [libpng16] Imported from libpng-1.6.19rc04.tar 2015-11-05 06:59:34 -06:00
Glenn Randers-Pehrson
6761aacbfa [libpng16] Bump version to 1.6.19rc03 2015-11-03 08:15:06 -06:00
Glenn Randers-Pehrson
b00d986d54 [libpng16] Imported from libpng-1.6.19rc02.tar 2015-10-31 09:04:18 -05:00
Glenn Randers-Pehrson
06509be841 [libpng16] Bump version to 1.6.19rc02 2015-10-29 09:28:33 -05:00
Glenn Randers-Pehrson
9c7ed35a65 [libpng16] Imported from libpng-1.6.19rc01.tar 2015-10-23 09:30:20 -05:00
Glenn Randers-Pehrson
05e81e18d2 [libpng16] Bump version to 1.6.19beta05 2015-10-14 22:25:29 -05:00
Glenn Randers-Pehrson
6ca8ee1518 [libpng16] Imported from libpng-1.6.19beta04.tar 2015-10-14 22:25:21 -05:00
Glenn Randers-Pehrson
068cb3a64c [libpng16] Bump version to 1.6.19beta04 2015-09-26 09:44:43 -05:00
Glenn Randers-Pehrson
f4302a73ac [libpng16] Imported from libpng-1.6.19beta03.tar 2015-09-26 09:44:34 -05:00
John Bowler
33a97c5c8a [libpng16] Fixed png_save_int_32 when int is not 2's complement (John Bowler). 2015-08-21 14:42:00 -05:00
Glenn Randers-Pehrson
39be3b81da [libpng16] Bump version to 1.6.19beta03 2015-08-19 12:58:26 -05:00
John Bowler
2d62f7406f [libpng16] Fixed the recently reported 1's complement security issue by
replacing the value that is illegal in the PNG spec, in both signed and
unsigned values, with 0. Illegal unsigned values (anything greater than or equal
to  0x80000000) can still pass through, but since these are not illegal
in ANSI-C (unlike 0x80000000 in the signed case) the checking that
occurs later can catch them (John Bowler).
2015-08-19 12:56:48 -05:00
Glenn Randers-Pehrson
6530e3898d [libpng16] Restored previous handling of negative input to png_set_sig_bytes(). 2015-08-17 21:56:03 -05:00
Robert C. Seacord
167b5e4c27 [libpng16] Safely convert num_bytes to a png_byte in png_set_sig_bytes() 2015-08-17 21:20:34 -05:00
Glenn Randers-Pehrson
a8242fe6fb [libng16] Reverted recent mistaken change of 0xnnnn to 0xnnnnUL 2015-08-17 20:46:27 -05:00
Glenn Randers-Pehrson
d8b93c29a7 [libpng16] Appended more "UL" to hex constants. 2015-08-17 10:56:17 -05:00
Glenn Randers-Pehrson
b9ba8d6a57 [libpng16] Mention in manual that 16-bit platform support has been dropped. 2015-08-16 23:32:04 -05:00
Glenn Randers-Pehrson
8ba4b13c55 [libpng16] Changed 0xnnnn constants to 0xnnnnUL. 2015-08-16 22:49:58 -05:00
Glenn Randers-Pehrson
8b83ff3704 [libpng16] Change "n bit" to "n-bit" in comments. 2015-08-13 20:57:18 -05:00
Victor Szakats
4e1d299e6b [libpng16] Removed unreachable "break" statements in png.c, pngread.c, and
pngrtran.c to suppress clang warnings (Bug report by Viktor Szakats).
2015-08-07 14:31:11 -05:00
Glenn Randers-Pehrson
52d159a784 [libpng16] Bump version to 1.6.19beta02 2015-07-30 11:24:53 -05:00
Glenn Randers-Pehrson
77becc566f [libpng16] Suppressed warnings from the Borland C++ 5.5.1/5.82 compiler in png.c 2015-07-29 08:01:12 -05:00
Glenn Randers-Pehrson
e485a09e0e [libpng16] Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler
(Bug report by Viktor Szaka'ts).  Several warnings remain and are
unavoidable, where we test for overflow.
2015-07-29 07:29:17 -05:00
Glenn Randers-Pehrson
59a82b40b0 [libpng16] Avoid potentially dereferencing NULL info_ptr in png_info_init_3(). 2015-07-25 08:03:05 -05:00
Glenn Randers-Pehrson
476250ebd2 [libpng16] Bump version to 1.6.19beta01 2015-07-23 20:20:53 -05:00
Glenn Randers-Pehrson
e6172809bd [libpng16] Imported from libpng-1.6.18.tar 2015-07-22 22:40:52 -05:00
Glenn Randers-Pehrson
285a9b22c7 [libpng16] Bump version to 1.6.18rc03 2015-07-13 08:31:05 -05:00