summaryrefslogtreecommitdiff
path: root/ext/soap/php_sdl.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2015-11-12 20:37:23 +0300
committerDmitry Stogov <dmitry@zend.com>2015-11-12 20:37:23 +0300
commit16fcd9dcbd344202479807f79eb852f1a23f57fa (patch)
tree6a00d38430d1ab3fec137e7f4bb8d4ef4ca4cb14 /ext/soap/php_sdl.c
parent067380d7c67e775ec436c71fc7bf084c21530e78 (diff)
parent04526093e4afa7cbe0f0c01f2a914229ef3fd45b (diff)
downloadphp-git-16fcd9dcbd344202479807f79eb852f1a23f57fa.tar.gz
Merge branch 'PHP-7.0'
* PHP-7.0: Fixed bug #70900 (SoapClient systematic out of memory error)
Diffstat (limited to 'ext/soap/php_sdl.c')
-rw-r--r--ext/soap/php_sdl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index 6efd2b06c0..143dc5bb2b 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;
}