From: Stanislav Malyshev <stas@php.net>
Date: Mon, 12 May 2014 01:15:29 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.13RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af5cc61cf374f3700872c989cfdf8e197248c57c;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
---

af5cc61cf374f3700872c989cfdf8e197248c57c
diff --cc NEWS
index 5ee5c567a6,03f8b87daf..aaf308804a
--- a/NEWS
+++ b/NEWS
@@@ -13,12 -10,9 +13,12 @@@ PH
      by tempnam()). (Boro Sitnikovski)
    . Fixed bug #67072 (Echoing unserialized "SplFileObject" crash). (Anatol)
    . Fixed bug #67245 (usage of memcpy() with overlapping src and dst in
-     zend_exceptions.c) (backported fix from PHP 5.6; initially committed
-     to wrong branch). (Bob)
+     zend_exceptions.c). (Bob)
+   . Fixed bug #67247 (spl_fixedarray_resize integer overflow). (Stas)
  
 +- Curl:
 +  . Fixed bug #64247 (CURLOPT_INFILE doesn't allow reset). (Mike)
 +
  - Date:
    . Fixed bug #67118 (DateTime constructor crash with invalid data). (Anatol)