com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .gitignore ext/date/php_date.c ext/openssl/openssl.c ext/phar/ph ar_internal.h
ext/phar/phar_object.c ext/soap/php _http.c ext/spl/spl_array.c ext/spl/spl_dllist. c ext/spl/spl_observer.c

From: Date: Tue, 04 Aug 2015 22:29:13 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .gitignore ext/date/php_date.c ext/openssl/openssl.c ext/phar/ph ar_internal.h
ext/phar/phar_object.c ext/soap/php _http.c ext/spl/spl_array.c ext/spl/spl_dllist. c ext/spl/spl_observer.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88319@lists.php.net to get a copy of this message
Commit: ed709d5aa01375beb7e0b408c4027bbb9cfb52b6 Author: Stanislav Malyshev <stas@php.net> Tue, 4 Aug 2015 15:29:13 -0700 Parents: 8d31e463a0a310599f55b53443f14ebc05e9cd32 d52c4857178cf30741905469c5a080bbdd973478 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed709d5aa01375beb7e0b408c4027bbb9cfb52b6 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: ext/soap/php_http.c ext/spl/spl_observer.c Bugs: https://bugs.php.net/70019 https://bugs.php.net/69793 https://bugs.php.net/70169 https://bugs.php.net/70166 https://bugs.php.net/70168 https://bugs.php.net/69892 https://bugs.php.net/70014 https://bugs.php.net/69441 https://bugs.php.net/70068 https://bugs.php.net/70121 https://bugs.php.net/70081 Changed paths: MM .gitignore MM ext/date/php_date.c MM ext/openssl/openssl.c MM ext/phar/phar_internal.h MM ext/phar/phar_object.c MM ext/soap/php_http.c MM ext/spl/spl_array.c MM ext/spl/spl_dllist.c MM ext/spl/spl_observer.c Diff: diff --cc ext/soap/php_http.c index 2045162,21a0da0..c8eba98 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@@ -822,21 -821,24 +822,24 @@@ try_again zend_hash_internal_pointer_reset(Z_ARRVAL_PP(cookies)); smart_str_append_const(&soap_headers, "Cookie: "); for (i = 0; i < n; i++) { + ulong numindx; - int res = zend_hash_get_current_key(Z_ARRVAL_PP(cookies), &key, &numindx, FALSE); ++ int res = zend_hash_get_current_key_ex(Z_ARRVAL_PP(cookies), &key, &key_len, &numindx, 0, NULL); zend_hash_get_current_data(Z_ARRVAL_PP(cookies), (void **)&data); - zend_hash_get_current_key_ex(Z_ARRVAL_PP(cookies), &key, &key_len, NULL, 0, NULL); - if (Z_TYPE_PP(data) == IS_ARRAY) { + if (res == HASH_KEY_IS_STRING && Z_TYPE_PP(data) == IS_ARRAY) { zval** value; if (zend_hash_index_find(Z_ARRVAL_PP(data), 0, (void**)&value) == SUCCESS && Z_TYPE_PP(value) == IS_STRING) { zval **tmp; if ((zend_hash_index_find(Z_ARRVAL_PP(data), 1, (void**)&tmp) == FAILURE || + Z_TYPE_PP(tmp) != IS_STRING || strncmp(phpurl->path?phpurl->path:"/",Z_STRVAL_PP(tmp),Z_STRLEN_PP(tmp)) == 0) && (zend_hash_index_find(Z_ARRVAL_PP(data), 2, (void**)&tmp) == FAILURE || + Z_TYPE_PP(tmp) != IS_STRING || in_domain(phpurl->host,Z_STRVAL_PP(tmp))) && (use_ssl || zend_hash_index_find(Z_ARRVAL_PP(data), 3, (void**)&tmp) == FAILURE)) { - smart_str_appendl(&soap_headers, key, strlen(key)); + smart_str_appendl(&soap_headers, key, key_len-1); smart_str_appendc(&soap_headers, '='); smart_str_appendl(&soap_headers, Z_STRVAL_PP(value), Z_STRLEN_PP(value)); smart_str_appendc(&soap_headers, ';');

« previous php.cvs (#88319) next »