diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-11-12 20:36:39 +0300 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-11-17 13:11:05 +0100 |
| commit | 14d8216404de76bf691b2e6fb5eea1002ccc3aaf (patch) | |
| tree | 9e501ace3a5b63f5485f2ccbc178fbf74d872a9a | |
| parent | cbc912d3ad908a89f7bd1bf349a80b576ee031c0 (diff) | |
| download | php-git-14d8216404de76bf691b2e6fb5eea1002ccc3aaf.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #70900 (SoapClient systematic out of memory error)
| -rw-r--r-- | ext/soap/php_sdl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index c5ce0fe8d3..2ab0206556 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; } |