]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-7.0.7
authorStanislav Malyshev <stas@php.net>
Wed, 25 May 2016 00:58:37 +0000 (17:58 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 25 May 2016 01:05:06 +0000 (18:05 -0700)
* 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

1  2 
ext/gd/libgd/gd_interpolation.c
ext/intl/locale/locale_methods.c

Simple merge
Simple merge