]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0.15' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 05:35:42 +0000 (21:35 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 05:35:42 +0000 (21:35 -0800)
* PHP-7.0.15:
  Fix #73832 - leave the table in a safe state if the size is too big.
  Fix bug #73831 - NULL Pointer Dereference while unserialize php object


Trivial merge