delta/php-git.git, branch php-5.6.30 git.php.net: repository/php-src.git 5.6.30 2017-01-19T00:17:47+00:00 Ferenc Kovacs tyra3l@gmail.com 2017-01-19T00:17:47+00:00 195427c55481d9913ac9dd3fbcedf2f7c637e6de 






Merge branch 'PHP-5.6' into PHP-5.6.30
2017-01-19T00:13:01+00:00

Ferenc Kovacs
tyra3l@gmail.com

2017-01-19T00:13:01+00:00

2ba4d0a04201bb6217f90036c9abac6052f01aba












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

Christoph M. Becker
cmbecker69@gmx.de

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

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)





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)







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

Christoph M. Becker
cmbecker69@gmx.de

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

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)





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)







Add additional serialize tests for fixed bugs
2017-01-16T12:24:13+00:00

Nikita Popov
nikic@php.net

2017-01-16T12:24:13+00:00

6477bb724e0c4e95dfc8f315cac4b7e7a692b0f8

These have been fixed as a side-effect of the delayed __wakeup
patch.





These have been fixed as a side-effect of the delayed __wakeup
patch.







Fix typo
2017-01-16T08:23:06+00:00

Stanislav Malyshev
stas@php.net

2017-01-16T08:23:06+00:00

50b38322b96416b0a5609591a52178f6100768da












Fix test
2017-01-16T02:42:22+00:00

Stanislav Malyshev
stas@php.net

2017-01-16T02:42:22+00:00

814966ad33f9a734e422e34327256d58a91d1272












Update more functions with path check
2017-01-16T01:31:08+00:00

Stanislav Malyshev
stas@php.net

2017-01-16T01:31:08+00:00

0ab1af7d3eff815e1809fe044e54283b5a1b8e27












Fix glob-wrapper.phpt to not fail in Windows
2017-01-10T22:18:52+00:00

Mitch Hagstrand
mhagstrand@gmail.com

2017-01-10T19:51:55+00:00

ad9c552b120b8f73a5e87b2f8af05e32db512e9f












Fix open_basedir check for glob:// opendir wrapper
2017-01-09T19:02:50+00:00

Sara Golemon
pollita@php.net

2017-01-09T19:02:50+00:00

7e49e8e7970b423968de7a53ea9a0796f4634276

php_check_open_basedir() expects a local filesystem path,
but we're handing it a `glob://...` URI instead.

Move the check to after the path trim so that we're checking
a meaningful pathspec.





php_check_open_basedir() expects a local filesystem path,
but we're handing it a `glob://...` URI instead.

Move the check to after the path trim so that we're checking
a meaningful pathspec.