Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix persistent leak on load_wsdl_ex failure
This commit is contained in:
Nikita Popov 2021-02-02 10:07:04 +01:00
commit f1a988af4b

View File

@ -739,9 +739,8 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri)
zend_hash_init(&ctx.portTypes, 0, NULL, NULL, 0);
zend_hash_init(&ctx.services, 0, NULL, NULL, 0);
load_wsdl_ex(this_ptr, struri, &ctx, 0);
zend_try {
load_wsdl_ex(this_ptr, struri, &ctx, 0);
schema_pass2(&ctx);
n = zend_hash_num_elements(&ctx.services);