]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a40e004 8825311)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 20 Jan 2015 18:40:11 +0000 (10:40 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 20 Jan 2015 18:40:11 +0000 (10:40 -0800)
commite2744c51b63d1e7c023f25927d3300d647bd97fe
tree5d1ea8d83601ebdcb970479f637d9c877e806954tree | snapshot
parenta40e004553f68fce94dcdcb924d8693e0008e7d5commit | diff
parent8825311ce1e9b0c3b627ff32808dd4e0d577c136commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
configure.in
main/php_version.h
ext/exif/exif.c diff1 | diff2 | blob | history
ext/standard/var_unserializer.c diff1 | diff2 | blob | history
ext/standard/var_unserializer.re diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.