delta/php-git.git, branch php-7.0.15 git.php.net: repository/php-src.git set versions and update NEWS 2017-01-17T09:51:38+00:00 Anatol Belski ab@php.net 2017-01-17T09:51:38+00:00 cc766d7730bdec064e32f8009154fa672b34ef9b 






Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
2017-01-17T08:43:01+00:00

Christoph M. Becker
cmbecker69@gmx.de

2016-08-16T16:23:36+00:00

e720bc03b19c22846c562a62b42235b544c1794c

We must not pretend that there are image data if there are none. Instead
we fail reading the image file gracefully.

(cherry picked from commit cdb648dc4115ce0722f3cc75e6a65115fc0e56ab)
(cherry picked from commit f1b2afc9d9e77edf41804f5dfc4e2069d8a12975)





We must not pretend that there are image data if there are none. Instead
we fail reading the image file gracefully.

(cherry picked from commit cdb648dc4115ce0722f3cc75e6a65115fc0e56ab)
(cherry picked from commit f1b2afc9d9e77edf41804f5dfc4e2069d8a12975)







Fix #73869: Signed Integer Overflow gd_io.c
2017-01-17T08:42:45+00:00

Christoph M. Becker
cmbecker69@gmx.de

2016-12-17T16:06:58+00:00

761cc2b766e040452f026a3b4c3b2c71bcbfb3dd

GD2 stores the number of horizontal and vertical chunks as words (i.e. 2
byte unsigned). These values are multiplied and assigned to an int when
reading the image, what can cause integer overflows. We have to avoid
that, and also make sure that either chunk count is actually greater
than zero. If illegal chunk counts are detected, we bail out from
reading the image.

(cherry picked from commit 5b5d9db3988b829e0b121b74bb3947f01c2796a1)
(cherry picked from commit d2274b01cbbadf5516b3ea87ad76fbae18834007)





GD2 stores the number of horizontal and vertical chunks as words (i.e. 2
byte unsigned). These values are multiplied and assigned to an int when
reading the image, what can cause integer overflows. We have to avoid
that, and also make sure that either chunk count is actually greater
than zero. If illegal chunk counts are detected, we bail out from
reading the image.

(cherry picked from commit 5b5d9db3988b829e0b121b74bb3947f01c2796a1)
(cherry picked from commit d2274b01cbbadf5516b3ea87ad76fbae18834007)







Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
2017-01-05T05:20:22+00:00

Anatol Belski
ab@php.net

2017-01-05T12:59:01+00:00

564a161258e53c05e1d0b02a16568e24d4da3b51

This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing
changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.

(cherry picked from commit 57736cc937fc6dfdfb403293d7bf88b264e83e15)





This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing
changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.

(cherry picked from commit 57736cc937fc6dfdfb403293d7bf88b264e83e15)







Merge branch 'PHP-5.6' into PHP-7.0
2017-01-05T03:43:46+00:00

Nikita Popov
nikic@php.net

2017-01-05T10:38:05+00:00

20d9ebc6fb75b55d3bc98bae9e2b8e796142486e

(cherry picked from commit 2022dacb9997df2391866df99eb1592a1527fc27)





(cherry picked from commit 2022dacb9997df2391866df99eb1592a1527fc27)







quick fix for the base branch version parsing, not perfect still
2017-01-05T00:57:10+00:00

Anatol Belski
ab@php.net

2017-01-05T00:49:36+00:00

81c25cd0433e51efa29f776356ec9237b1ddd63f

(cherry picked from commit 2ca5aa9418a126dc4e5fd6becca41adcf86f000f)





(cherry picked from commit 2ca5aa9418a126dc4e5fd6becca41adcf86f000f)







prepare RC versions
2017-01-04T23:57:19+00:00

Anatol Belski
ab@php.net

2017-01-04T23:57:19+00:00

7864e3103911663c4caf1125509c471939df7e0a












Merge branch 'PHP-5.6' into PHP-7.0
2017-01-04T23:24:25+00:00

Nikita Popov
nikic@php.net

2017-01-04T23:22:25+00:00

b47c49d7a00bc34d7e0f3d72732f66e904da6fa7












Add tests for delayed __wakeup()
2017-01-04T23:21:48+00:00

Nikita Popov
nikic@php.net

2017-01-04T23:20:56+00:00

f697874e3f294623c1c1ca00fb98edf98cddcc67












Implement delayed __wakeup
2017-01-04T23:21:48+00:00

Nikita Popov
nikic@php.net

2017-01-04T23:19:26+00:00

0426b916df396a23e5c34514e4f2f0627efdcdf0