com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/soap/php_sdl.c

From: Date: Thu, 12 Nov 2015 17:36:39 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/soap/php_sdl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89835@lists.php.net to get a copy of this message
Commit: 04526093e4afa7cbe0f0c01f2a914229ef3fd45b Author: Dmitry Stogov <dmitry@zend.com> Thu, 12 Nov 2015 20:36:39 +0300 Parents: cc10da474d36820d103d410795bc70802284292b f8bf9bd86bdeef33a48e43d772d8a25a4fe3e6ff Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=04526093e4afa7cbe0f0c01f2a914229ef3fd45b Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Fixed bug #70900 (SoapClient systematic out of memory error) Bugs: https://bugs.php.net/70900 Changed paths: MM NEWS MM ext/soap/php_sdl.c Diff: diff --cc NEWS index 781bd7e,a0b821f..6327727 --- a/NEWS +++ b/NEWS @@@ -1,30 -1,17 +1,33 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2015, PHP 5.6.17 +?? ??? 2015, PHP 7.0.1 + +- Core: + . Fixed bug #70898, #70895 (null ptr deref and segfault with crafted callable). + (Anatol, Laruence) + - SOAP: + . Fixed bug #70900 (SoapClient systematic out of memory error). (Dmitry) + -26 Nov 2015, PHP 5.6.16 +- Streams/Socket + . Add IPV6_V6ONLY constant / make it usable in stream contexts. (Bob) + +12 Nov 2015, PHP 7.0.0 RC 7 - Core: - . Fixed bug #70828 (php-fpm 5.6 with opcache crashes when referencing a - non-existent constant). (Laruence) - . Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l). + . Fixed bug #70249 (Segmentation fault while running PHPUnit tests on + phpBB 3.2-dev). (Laruence) + . Fixed bug #70873 (Regression on private static properties access). (Laruence) + . Fixed bug #70805 (Segmentation faults whilst running Drupal 8 test suite). + (Dmitry, Laruence) + . Fixed bug #70862 (Several functions do not check return code of + php_stream_copy_to_mem()). (Anatol) + . Fixed bug #70863 (Incorect logic to increment_function for proxy objects). + (Anatol) + . Fixed bug #70842 (Persistent Stream Segmentation Fault). (Caleb Champlin) + . Fixed bug #70323 (Regression in zend_fetch_debug_backtrace() can cause + segfaults). (Aharvey, Laruence) - OCI8: . Fixed bug #68298 (OCI int overflow) (Senthil). diff --cc ext/soap/php_sdl.c index 6efd2b0,548a422..143dc5b --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@@ -1149,7 -1157,9 +1149,9 @@@ static sdlPtr load_wsdl(zval *this_ptr zend_hash_init(ctx.sdl->bindings, 0, NULL, delete_binding, 0); } - zend_hash_str_add_ptr(ctx..sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), tmpbinding); - if (zend_hash_add(ctx.sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), &tmpbinding, sizeof(sdlBindingPtr), NULL) != SUCCESS) { - zend_hash_next_index_insert(ctx.sdl->bindings, &tmpbinding, sizeof(sdlBindingPtr), NULL); ++ if (!zend_hash_str_add_ptr(ctx.sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), tmpbinding)) { ++ zend_hash_next_index_insert_ptr(ctx.sdl->bindings, tmpbinding); + } trav= trav->next; }

« previous php.cvs (#89835) next »