From: Stanislav Malyshev <stas@php.net>
Date: Wed, 25 May 2016 00:58:37 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-7.0.7
X-Git-Tag: php-7.0.7~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ed0114e7f25f683eede5528e3b31f2fe2495393;p=php

Merge branch 'PHP-5.5' into PHP-7.0.7

* 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
---

3ed0114e7f25f683eede5528e3b31f2fe2495393