]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b5e2661 e2744c5)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 20 Jan 2015 18:40:39 +0000 (10:40 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 20 Jan 2015 18:40:39 +0000 (10:40 -0800)
commite18ec956873d1cc1fcd4647f4a218c25d0f80209
tree81879f4e11147b6e6876e4803a154cfdefd2ad12tree | snapshot
parentb5e2661fb6546e17e5f9a6982f052b2dce541860commit | diff
parente2744c51b63d1e7c023f25927d3300d647bd97fecommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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:
ext/standard/var_unserializer.c
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.