diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 16:52:00 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 16:52:00 +0200 |
| commit | 2fe2e80b5fe851059b2934b30aa6fd459b9e8c0c (patch) | |
| tree | 80fd30bf50bc4bc87e0762941a6f0cb8c7798026 | |
| parent | b60c76f1de0c8c27d3e412dcd7010f383760c1d5 (diff) | |
| parent | 79b5b1a97f5f9e700201cb41c9e6ca8f4472794c (diff) | |
| download | php-git-2fe2e80b5fe851059b2934b30aa6fd459b9e8c0c.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | ext/soap/php_encoding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 7e8a5da935..c44fec3ab0 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -2234,7 +2234,7 @@ static xmlNodePtr to_xml_array(encodeTypePtr type, zval *data, int style, xmlNod } else { add_next_index_zval(&array_copy, val); } - Z_ADDREF_P(val); + Z_TRY_ADDREF_P(val); iter->funcs->move_forward(iter); if (EG(exception)) { @@ -2815,7 +2815,7 @@ static zval *guess_zval_convert(zval *ret, encodeTypePtr type, xmlNodePtr data) object_init_ex(&soapvar, soap_var_class_entry); add_property_long(&soapvar, "enc_type", enc->details.type); - Z_DELREF_P(ret); + Z_TRY_DELREF_P(ret); add_property_zval(&soapvar, "enc_value", ret); parse_namespace(type_name, &cptype, &ns); nsptr = xmlSearchNs(data->doc, data, BAD_CAST(ns)); |