]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1'
authorStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 05:37:10 +0000 (21:37 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 05:37:10 +0000 (21:37 -0800)
commit13c18d460104a3dcfc9f913a68e6b2d47cf2b799
tree821885939dffac0f1e388d5b04bb85a835d55cfc
parent0de25147d39f2b456fb37d7b3687dad5d40aeb32
parentca72faa2c50b249715597bbee51fcd01718a0494
Merge branch 'PHP-7.1'

* PHP-7.1:
  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
Zend/zend_hash.c
ext/wddx/wddx.c