delta/php-git.git, branch php-7.0.7 git.php.net: repository/php-src.git reorder entries and fix typo 2016-05-25T09:31:05+00:00 Anatol Belski ab@php.net 2016-05-25T09:31:05+00:00 fb59213fc461f079bc218abf44cb5e2b4db2182c 






set version and update NEWS
2016-05-25T08:22:53+00:00

Anatol Belski
ab@php.net

2016-05-25T08:22:53+00:00

bcad8619f8cf5796571a4207aa9b4a86ee1b03b3












Merge branch 'PHP-5.5' into PHP-7.0.7
2016-05-25T01:05:06+00:00

Stanislav Malyshev
stas@php.net

2016-05-25T00:58:37+00:00

3ed0114e7f25f683eede5528e3b31f2fe2495393

* PHP-5.5:
  Fix memory leak in imagescale()
  Update NEWS
  Better fix for bug #72135
  Fixed bug #72227: imagescale out-of-bounds read
  Fix bug #72241: get_icu_value_internal out-of-bounds read
  Fix bug #72135 - don't create strings with lengths outside int range
  Add check for string overflow to all string add operations
  Fix bug #72114 - int/size_t confusion in fread
  Updated NEWS
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()

Conflicts:
	Zend/zend_operators.c
	ext/intl/locale/locale_methods.c
	ext/phar/dirstream.c
	ext/phar/tests/bug71331.phpt
	ext/standard/file.c
	ext/standard/html.c





* PHP-5.5:
  Fix memory leak in imagescale()
  Update NEWS
  Better fix for bug #72135
  Fixed bug #72227: imagescale out-of-bounds read
  Fix bug #72241: get_icu_value_internal out-of-bounds read
  Fix bug #72135 - don't create strings with lengths outside int range
  Add check for string overflow to all string add operations
  Fix bug #72114 - int/size_t confusion in fread
  Updated NEWS
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()

Conflicts:
	Zend/zend_operators.c
	ext/intl/locale/locale_methods.c
	ext/phar/dirstream.c
	ext/phar/tests/bug71331.phpt
	ext/standard/file.c
	ext/standard/html.c







Fix memory leak in imagescale()
2016-05-24T23:12:01+00:00

Stanislav Malyshev
stas@php.net

2016-05-24T23:12:01+00:00

9a826a3bd99315b7c4d4673acd3084c99eb04253












Update NEWS
2016-05-24T22:56:02+00:00

Stanislav Malyshev
stas@php.net

2016-05-24T22:56:02+00:00

f423e1bb895d64c50dc538e8cdc556324e8b8cc2












Better fix for bug #72135
2016-05-24T22:52:15+00:00

Stanislav Malyshev
stas@php.net

2016-05-24T22:52:15+00:00

e9559131152ab0fa89737db11ebe8f43e1435b96












Fixed bug #72227: imagescale out-of-bounds read
2016-05-23T07:34:35+00:00

Stanislav Malyshev
stas@php.net

2016-05-23T07:28:02+00:00

7a1aac3343af85b4af4df5f8844946eaa27394ab

Ported from https://github.com/libgd/libgd/commit/4f65a3e4eedaffa1efcf9ee1eb08f0b504fbc31a





Ported from https://github.com/libgd/libgd/commit/4f65a3e4eedaffa1efcf9ee1eb08f0b504fbc31a







Fix bug #72241: get_icu_value_internal out-of-bounds read
2016-05-23T00:49:02+00:00

Stanislav Malyshev
stas@php.net

2016-05-23T00:49:02+00:00

97eff7eb57fc2320c267a949cffd622c38712484












Fix bug #72135 - don't create strings with lengths outside int range
2016-05-16T06:26:51+00:00

Stanislav Malyshev
stas@php.net

2016-05-16T06:26:51+00:00

0da8b8b801f9276359262f1ef8274c7812d3dfda












set versions
2016-05-10T11:16:44+00:00

Anatol Belski
ab@php.net

2016-05-10T11:16:44+00:00

2beacaad49a50b18bfdb03fdd5272d0f1daa19a1