]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 17 Mar 2015 20:23:51 +0000 (13:23 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 17 Mar 2015 20:23:51 +0000 (13:23 -0700)
commit33a5532b66712884ca25897e7ffebfb890fba2f0
treeb128295d9a4618af006e94e61d1327b48b1beb6d
parent3d00867bbace3a500f6ff595be9c07eea073f28b
parentd5e523f52fd219e3143392f27c1449db65a1dbc1
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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