From: Stanislav Malyshev <stas@php.net>
Date: Wed, 25 May 2016 00:21:22 +0000 (-0700)
Subject: Merge branch 'PHP-5.6.22' into PHP-5.6
X-Git-Tag: php-7.0.8RC1~43^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2464b092eb14bf9bf3298acdc71e6b5deda042d1;p=php

Merge branch 'PHP-5.6.22' into PHP-5.6

* PHP-5.6.22:
  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
  prepare for 5.6.22RC1
  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
---

2464b092eb14bf9bf3298acdc71e6b5deda042d1