com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/soap/php _sdl.c
| From: | Anatol Belski | Date: | Tue, 17 Nov 2015 12:11:05 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/soap/php _sdl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89922@lists.php.net to get a copy of this message | ||
Commit: 14d8216404de76bf691b2e6fb5eea1002ccc3aaf
Author: Dmitry Stogov <dmitry@zend.com> Thu, 12 Nov 2015 20:36:39 +0300
Committer: Anatol Belski <ab@php.net> Tue, 17 Nov 2015 13:11:05 +0100
Parents: cbc912d3ad908a89f7bd1bf349a80b576ee031c0
Branches: PHP-7.0.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=14d8216404de76bf691b2e6fb5eea1002ccc3aaf
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:
M ext/soap/php_sdl.c
Diff:
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index c5ce0fe..2ab0206 100644
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -1149,7 +1149,9 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri)
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_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;
}