com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/exif/exif.c ext/hash/hash_haval.c ext/pcre/php_pcre.c ext/sessi on/session.c ext/soap/soap.c
ext/spl/spl_dllist.c ext/spl/spl_observer.c ext/standard/var.c ext/stan dard/var_unserializer.c ext/standard/var_unserializer .re
ext/xsl/xsltprocessor.c ext/zip/php_zip.c
| From: | Stanislav Malyshev | Date: | Tue, 01 Sep 2015 18:42:19 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/exif/exif.c ext/hash/hash_haval.c ext/pcre/php_pcre.c ext/sessi on/session.c ext/soap/soap.c ext/spl/spl_dllist.c ext/spl/spl_observer.c ext/standard/var.c ext/stan dard/var_unserializer.c ext/standard/var_unserializer .re ext/xsl/xsltprocessor.c ext/zip/php_zip.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88836@lists.php.net to get a copy of this message | ||
Commit: 33d3acaae79845e8bd587b4d0799ef2dca07fdc3
Author: Stanislav Malyshev <stas@php.net> Tue, 1 Sep 2015 11:42:19 -0700
Parents: 15e9f4baf48f1a02091d1dbf505d9c6d561bc1d4 48cfd1160b4667115f33c4398215759d5e0643d8
Branches: PHP-5.5 PHP-5.5.29
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=33d3acaae79845e8bd587b4d0799ef2dca07fdc3
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix for bug #69782
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
5.4.45 next
Conflicts:
configure.in
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_version.h
Bugs:
https://bugs.php.net/70172
https://bugs.php.net/70312
https://bugs.php.net/70366
https://bugs.php.net/70365
https://bugs.php.net/70388
https://bugs.php.net/70350
https://bugs.php.net/70385
https://bugs.php.net/70345
https://bugs..php.net/70219
https://bugs.php.net/69782
https://bugs.php.net/69085
Changed paths:
MM ext/exif/exif.c
MM ext/hash/hash_haval.c
MM ext/pcre/php_pcre.c
MM ext/session/session.c
MM ext/soap/soap.c
MM ext/spl/spl_dllist.c
MM ext/spl/spl_observer.c
MM ext/standard/var.c
MM ext/standard/var_unserializer.c
MM ext/standard/var_unserializer.re
MM ext/xsl/xsltprocessor.c
MM ext/zip/php_zip.c
Diff: