]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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

1  2 
ext/exif/exif.c patch | diff1 | diff2 | blob | history
ext/standard/var_unserializer.c patch | diff1 | diff2 | blob | history
ext/standard/var_unserializer.re patch | diff1 | diff2 | blob | history

diff --cc ext/exif/exif.c
Simple merge
diff --cc ext/standard/var_unserializer.c
Simple merge
diff --cc ext/standard/var_unserializer.re
Simple merge
Unnamed repository; edit this file 'description' to name the repository.