diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 16:51:47 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 16:51:47 +0200 |
| commit | 3f73916f107c9618c659417b5044b8e66ea6469b (patch) | |
| tree | dc8275b4f1020628354e9ac032785d2a27c7f8fd | |
| parent | 9d141f98890847f6b239a5ce7f02801912202525 (diff) | |
| parent | a7de2af46ccff1207a7008602b079b92de57a9fe (diff) | |
| download | php-git-3f73916f107c9618c659417b5044b8e66ea6469b.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -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 87e13161c7..faca3acc15 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -2267,7 +2267,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)) { @@ -2848,7 +2848,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)); |