Commit Graph

979 Commits

Author SHA1 Message Date
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
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
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
9928ee0a52 [libpng16] Bump version to 1.6.24beta04 2016-07-04 09:55:49 -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
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
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
830608b4b8 [libpng16] Bump version to 1.6.22beta06 2016-04-27 13:01:29 -05:00
Glenn Randers-Pehrson
daf2169797 [libpng16] Bump version to 1.6.22beta05 2016-04-05 19:38:42 -05:00
Glenn Randers-Pehrson
edad4639cf [libpng16] Bump version to 1.6.22beta04 2016-03-09 12:04:48 -06:00
Glenn Randers-Pehrson
461c7e45b5 [libpng16] Bump version to 1.6.22beta03 2016-02-08 17:13:14 -06:00
John Bowler
ac796d3f9a Only use exit(77) in configure builds
Signed-off-by: John Bowler <jbowler@acm.org>
2016-01-26 17:55:39 -08:00
Glenn Randers-Pehrson
e0ce90ea0a [libpng16] Bump version to 1.6.22beta02 2016-01-23 14:58:07 -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
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
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
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
John Bowler
8a08b6457a Test backport
Tests backported from the multi-version compatible ones in libpng 1.7

Signed-off-by: John Bowler <jbowler@acm.org>
2015-11-23 20:15:51 -08:00
Glenn Randers-Pehrson
a1a2ae2a25 [libpng16] Bump version to 1.6.20beta02 2015-11-22 14:11:29 -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
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
59e655b020 [libpng16] Added sPLT support to pngtest.c 2015-10-10 12:05:55 -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
Glenn Randers-Pehrson
39be3b81da [libpng16] Bump version to 1.6.19beta03 2015-08-19 12:58:26 -05:00
Glenn Randers-Pehrson
52d159a784 [libpng16] Bump version to 1.6.19beta02 2015-07-30 11:24:53 -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
Glenn Randers-Pehrson
be55943d45 [libpng16] Imported from libpng-1.6.18rc02.tar 2015-07-13 07:09:33 -05:00
Glenn Randers-Pehrson
4cb6607c89 [libpng16] Imported from libpng-1.6.18rc01.tar 2015-07-09 11:14:03 -05:00
Glenn Randers-Pehrson
d78eb10f29 [libpng16] Bump version to 1.6.18beta10 2015-07-04 20:43:09 -05:00
Glenn Randers-Pehrson
4e5ac72254 [libpng16] Bump version to 1.6.18beta09 2015-06-30 10:54:55 -05:00
Glenn Randers-Pehrson
4293254bef [libpng16] Bump version to 1.6.18beta08 2015-06-06 17:03:35 -05:00
Glenn Randers-Pehrson
1a6841c99c [libpng16] Bump version to 1.6.18beta07 2015-06-01 09:33:33 -05:00
Glenn Randers-Pehrson
a008dd8344 [libpng16] Bump version to 1.6.18beta06 2015-05-31 10:20:22 -05:00
Glenn Randers-Pehrson
9fbdce8fb5 [libpng16] Bump version to 1.6.18beta05 2015-05-29 11:35:15 -05:00
Glenn Randers-Pehrson
d2fedd629d [libpng16] Avoid Coverity issue 80858 (REVERSE NULL) in pngtest.c
PNG_DEBUG builds.
2015-05-09 21:47:00 -05:00
Glenn Randers-Pehrson
846357d592 [libpng16] Bump version to 1.6.18beta04 2015-05-06 16:39:42 -05:00
Glenn Randers-Pehrson
23da29af91 [libpng16] Bump version to 1.6.18beta03 2015-04-26 16:38:18 -05:00
Glenn Randers-Pehrson
507a8cdc5e [libpng16] Bump version to 1.6.18beta02 2015-04-01 08:24:26 -05:00
Glenn Randers-Pehrson
218a6fe9e5 [libpng16] Bump version to 1.6.18beta01 2015-03-26 08:55:25 -05:00
Glenn Randers-Pehrson
c98f7fb4e3 [libpng16] Imported from libpng-1.6.17.tar 2015-03-26 08:11:12 -05:00
Glenn Randers-Pehrson
04445235f1 [libpng16] Bump version to 1.6.17rc06 2015-03-21 12:11:10 -05:00
Glenn Randers-Pehrson
0aabfe2a4c [libpng16] Bump version to 1.6.17rc05 2015-03-17 08:14:23 -05:00
Glenn Randers-Pehrson
49fa8d4cdd [libpng16] Bump version to 1.6.17rc04 2015-03-12 09:24:49 -05:00
Glenn Randers-Pehrson
a60de343a9 [libpng16] Imported from libpng-1.6.17rc03.tar 2015-03-12 06:49:06 -05:00
Glenn Randers-Pehrson
bbe2be3f54 [libpng16] Spelling fixes: less then N -> less than N (Lauri Nurmi) 2015-03-07 13:13:11 -06:00
Glenn Randers-Pehrson
7f85da8df7 [libpng16] Imported from libpng-1.6.17rc02.tar 2015-03-05 20:54:07 -06:00
Glenn Randers-Pehrson
3e0bef6da4 [libpng16] Imported from libpng-1.6.17rc01.tar 2015-03-04 11:19:32 -06:00
Glenn Randers-Pehrson
82511341d7 [libpng16] Bump version to 1.6.17beta07 2015-02-27 19:20:37 -06:00
Glenn Randers-Pehrson
3f49c1e42a [libpng16] Bump version to 1.6.17beta06 2015-02-25 15:42:16 -06:00
Glenn Randers-Pehrson
76f93293a0 [libpng16] Bump version to 1.6.17beta05 2015-02-21 12:49:38 -06:00
Glenn Randers-Pehrson
43d90b1610 [libpng16] Bump version to 1.6.17beta04 2015-02-17 10:52:33 -06:00
Glenn Randers-Pehrson
4b65a89cf4 [libpng16] Eliminated PNG_SAFE_LIMITS macro and restored the 1-million-column
and 1-million-row default limits in pnglibconf.dfa, that can be reset
by the user at build time or run time.  This provides a more robust
defense against DOS and as-yet undiscovered overflows.

Display user limits in the output from pngtest.
2015-02-16 22:52:07 -06:00
Glenn Randers-Pehrson
471b38aa00 [libpng16] Bump version to 1.6.17beta03 2015-02-07 09:16:17 -06:00
Glenn Randers-Pehrson
8cd78da8b3 [libpng16] Do not build png_product2() when it is unused.
Work around more Coverity-scan dead-code warnings.
2015-02-07 09:03:30 -06:00
Glenn Randers-Pehrson
c73d6219f2 [libpng16] Bump version to 1.6.17beta02 2015-01-28 19:20:51 -06:00
Glenn Randers-Pehrson
ecd074945c [libpng16] Bump version to 1.6.17beta01 2014-12-21 22:56:42 -06:00
Glenn Randers-Pehrson
88dd30b232 [libpng16] Imported from libpng-1.6.16.tar 2014-12-21 21:53:00 -06:00
Glenn Randers-Pehrson
10569a452f [libpng16] Imported from libpng-1.6.16rc03.tar 2014-12-21 17:12:39 -06:00
Glenn Randers-Pehrson
06ee38423b [libpng16] Imported from libpng-1.6.16rc02.tar 2014-12-21 13:54:45 -06:00
Glenn Randers-Pehrson
6d8c88177a [libpng16] Imported from libpng-1.6.16rc01.tar 2014-12-21 09:18:15 -06:00
Glenn Randers-Pehrson
0659cddd21 [libpng16] Bump version to 1.6.16beta03 2014-12-14 19:42:05 -06:00
Glenn Randers-Pehrson
91f9e0370d [libpng16] Bump version to 1.6.16beta02 2014-12-14 12:43:12 -06:00
Glenn Randers-Pehrson
2d24cbdd98 [libpng16] Bump version to 1.6.16beta01 2014-11-21 08:25:32 -06:00
Glenn Randers-Pehrson
e8ef689cb9 [libpng16] Imported from libpng-1.6.15.tar 2014-11-20 10:22:57 -06:00
Glenn Randers-Pehrson
aebb7585c9 [libpng16] Imported from libpng-1.6.15rc03.tar 2014-11-16 20:04:53 -06:00
Glenn Randers-Pehrson
d4965b4014 [libpng16] Imported from libpng-1.6.15rc02.tar 2014-11-14 09:51:59 -06:00
Glenn Randers-Pehrson
6df21524cd [libpng16] Imported from libpng-1.6.15rc01.tar 2014-11-13 06:47:08 -06:00
Glenn Randers-Pehrson
40656e9855 [libpng16] Bump version to 1.6.15beta08 2014-11-07 06:45:39 -06:00
Glenn Randers-Pehrson
cda68df8c1 [libpng16] Changed "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */" 2014-11-06 22:11:39 -06:00
Glenn Randers-Pehrson
674c3e5816 [libpng16] Bump version to 1.6.15beta07 2014-11-06 07:37:32 -06:00
Glenn Randers-Pehrson
61ea3eacb0 [libpng16] Reverted use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING
in the manual, example.c, pngtest.c, and applications in the contrib directory.
It was incorrect advice.
2014-11-06 06:39:56 -06:00
Glenn Randers-Pehrson
8e7c35fc81 [libpng16] Bump version to 1.6.15beta06 2014-11-05 19:08:08 -06:00
Glenn Randers-Pehrson
f1b547a509 [libpng16] Use png_get_libpng_ver(NULL), not PNG_LIBPNG_VER_STRING 2014-11-04 23:33:46 -06:00
Glenn Randers-Pehrson
5efb1327df [libpng16] Bump version to 1.6.15beta05 2014-11-04 07:08:37 -06:00
Glenn Randers-Pehrson
2eb712e519 [libpng16] Bump version to 1.6.15beta04 2014-11-03 09:33:51 -06:00
Glenn Randers-Pehrson
bd3818eb1b [libpng16] Bump version to 1.6.15beta03 2014-11-01 18:59:15 -05:00
Glenn Randers-Pehrson
5d713fe123 [libpng16] Changed remaining "if (!x)" to "if (x == 0)" and "if (x)" to
"if (x !== 0)"
2014-10-31 20:58:40 -05:00
Glenn Randers-Pehrson
6b9a20e7f9 [libpng16] Bump version to 1.6.15beta02 2014-10-29 09:13:06 -05:00
Glenn Randers-Pehrson
7f6826368a [libpng16] Use %p instead of %x to print pointers in pngtest debug output 2014-10-28 10:22:37 -05:00
Glenn Randers-Pehrson
ebba0746bc [libpng16] Changed "if (!x)" to "if (x == 0)" and "if (x)" to "if (x !== 0)" 2014-10-25 12:22:39 -05:00
Glenn Randers-Pehrson
56e9307d8f [libpng16] Bump version to 1.6.15beta01 2014-10-22 21:02:27 -05:00
Glenn Randers-Pehrson
edb772fd6d [libpng16] Imported from libpng-1.6.14.tar 2014-10-22 19:32:52 -05:00
Glenn Randers-Pehrson
8ba743d8d2 [libpng16] Bump version to 1.6.14rc03 2014-10-17 09:15:50 -05:00
Glenn Randers-Pehrson
279205664f [libpng16] Imported from libpng-1.6.14rc02.tar 2014-10-17 09:09:54 -05:00
Glenn Randers-Pehrson
6cae24c265 [libpng16] Fixed some typos in comments. 2014-10-13 11:11:21 -05:00
Glenn Randers-Pehrson
06ec570881 [libpng16] Bump version to 1.6.14beta08 2014-10-07 18:57:36 -05:00
Glenn Randers-Pehrson
f56c00f050 [libpng16] Bump version to 1.6.14beta07 2014-10-05 07:48:53 -05:00
Glenn Randers-Pehrson
f1eacc08e6 [libpng16] Bump version to 1.6.14beta06 2014-10-01 10:46:37 -05:00
Glenn Randers-Pehrson
4c0ded3c4e [libpng16] Bump version to 1.6.14beta05 2014-09-27 10:39:12 -05:00
Glenn Randers-Pehrson
b4ef94559d [libpng16] Bump version to 1.6.14beta04 2014-09-19 07:58:07 -05:00
Glenn Randers-Pehrson
77145bf678 [libpng16] Bump version to 1.6.14beta03 2014-09-18 09:56:47 -05:00
Glenn Randers-Pehrson
3fe1616c45 [libpng16] Bump version to 1.6.14beta02 2014-09-14 14:23:40 -05:00
Glenn Randers-Pehrson
17fba0f7d1 [libpng16] Bump version to 1.6.14beta01 2014-08-21 09:16:02 -05:00
Glenn Randers-Pehrson
259fb7761d [libpng16] Imported from libpng-1.6.13.tar 2014-08-21 05:57:43 -05:00
Glenn Randers-Pehrson
3ac41798c3 [libpng16] Bump version to 1.6.13rc02 2014-08-13 22:08:10 -05:00
Glenn Randers-Pehrson
26a94ab06f [libpng16] Imported from libpng-1.6.13rc01.tar 2014-08-13 22:08:01 -05:00
Glenn Randers-Pehrson
83fb26e38d [libpng16] Bump version to 1.6.13beta05 2014-08-07 20:00:00 -05:00
Glenn Randers-Pehrson
72e25f9583 [libpng16] Bump version to 1.6.13beta04 2014-08-02 21:32:49 -05:00
Glenn Randers-Pehrson
0ece631b37 [libpng16] Bump version to 1.6.13beta03 2014-07-21 17:21:30 -05:00
Glenn Randers-Pehrson
398b00734c [libpng16] Bump version to 1.6.13beta02 2014-07-04 12:32:40 -05:00
Glenn Randers-Pehrson
212fd5745d [libpng16] Bump version to 1.6.13beta01 2014-06-11 21:13:33 -05:00
Glenn Randers-Pehrson
e429c66cea [libpng16] Imported from libpng-1.6.12.tar 2014-06-11 20:41:51 -05:00
Glenn Randers-Pehrson
1a4c0144da [libpng16] Bump version to 1.6.12rc04 2014-06-08 12:10:04 -05:00
Glenn Randers-Pehrson
db1a0e763f [libpng16] Imported from libpng-1.6.12rc03.tar 2014-06-07 22:46:46 -05:00
Glenn Randers-Pehrson
ff3fb08157 [libpng16] Imported from libpng-1.6.12rc02.tar 2014-06-07 14:49:03 -05:00
Glenn Randers-Pehrson
b41a37d403 [libpng16] Imported from libpng-1.6.12rc01.tar 2014-06-06 18:31:35 -05:00
Glenn Randers-Pehrson
da7b692ce0 [libpng16] Bump version to 1.6.12beta01 2014-06-06 11:57:30 -05:00
Glenn Randers-Pehrson
c4e0f3de64 [libpng16] Imported from libpng-1.6.11.tar 2014-06-05 10:00:45 -05:00