From: Stanislav Malyshev <stas@php.net>
Date: Wed, 25 May 2016 03:51:52 +0000 (-0700)
Subject: Merge branch 'PHP-7.0.7' into PHP-7.0
X-Git-Tag: php-7.0.8RC1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fe563e8d84ebf405d0c555755ccc912ce33fb5f;p=php

Merge branch 'PHP-7.0.7' into PHP-7.0

* PHP-7.0.7:
  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
  set versions
  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:
	configure.in
	main/php_version.h
---

2fe563e8d84ebf405d0c555755ccc912ce33fb5f