com php-src: Merge branch 'PHP-5.4.45' into PHP-5.5.29: ext/exif/exif.c ext/pcre/php_pcre.c ext/soap/soap.c ext/spl/spl_dll ist.c
ext/spl/spl_observer.c ext/standard/var.c e xt/standard/var_unserializer.c ext/standard/var_unseria lizer.re ext/zip/php_zip.c
| From: | Stanislav Malyshev | Date: | Tue, 01 Sep 2015 07:28:39 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4.45' into PHP-5.5.29: ext/exif/exif.c ext/pcre/php_pcre.c ext/soap/soap.c ext/spl/spl_dll ist.c ext/spl/spl_observer.c ext/standard/var.c e xt/standard/var_unserializer.c ext/standard/var_unseria lizer.re ext/zip/php_zip.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88835@lists.php.net to get a copy of this message | ||
Commit: 6935058a986034c41d893fa36104b1f68777fd39
Author: Stanislav Malyshev <stas@php.net> Tue, 1 Sep 2015 00:28:39 -0700
Parents: fc8eff897bd7fe3fed7f6867d2d6a86117a5278d c8f07ad4771620252bf542e09938633bfb837363
Branches: PHP-5.5.29
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6935058a986034c41d893fa36104b1f68777fd39
Log:
Merge branch 'PHP-5.4.45' into PHP-5.5.29
* PHP-5.4.45:
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)
Conflicts:
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c
Bugs:
https://bugs.php.net/70366
https://bugs.php.net/70365
https://bugs.php.net/70172
https://bugs.php.net/70388
https://bugs.php.net/70350
https://bugs.php.net/70385
https://bugs.php.net/70345
Changed paths:
MM ext/exif/exif.c
MM ext/pcre/php_pcre.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/zip/php_zip..c
Diff:
diff --cc ext/pcre/php_pcre.c
index 7cc16ca,071b1a7..06e35e5
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@@ -571,10 -550,8 +571,10 @@@ static void php_do_pcre_match(INTERNAL_
RETURN_FALSE;
}
+ pce->refcount++;
- php_pcre_match_impl(pce, subject, subject_len, return_value, subpats,
+ php_pcre_match_impl(pce, subject, subject_len, return_value, subpats,
global, ZEND_NUM_ARGS() >= 4, flags, start_offset TSRMLS_CC);
+ pce->refcount--;
}
/* }}} */