]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 17 Mar 2015 20:22:12 +0000 (13:22 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 17 Mar 2015 20:22:12 +0000 (13:22 -0700)
commitd5e523f52fd219e3143392f27c1449db65a1dbc1
tree7f1176b7df547b1a7fb246cdb6c85ce3b40d57f1
parent3dfccd7ba5a9ef88f3c40b710010a4e4ba2e662e
parent646572d6d3847d68124b03936719f60936b49a38
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()

Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re