archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source
This commit is contained in:
Nikita Popov 2019-07-12 16:51:52 +02:00
commit 79b5b1a97f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/soap/php_encoding.c
View file

@ -2234,7 +2234,7 @@ static xmlNodePtr to_xml_array(encodeTypePtr type, zval *data, int style, xmlNod
} else { } else {
add_next_index_zval(&array_copy, val); add_next_index_zval(&array_copy, val);
} }
Z_ADDREF_P(val); Z_TRY_ADDREF_P(val);
iter->funcs->move_forward(iter); iter->funcs->move_forward(iter);
if (EG(exception)) { 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); object_init_ex(&soapvar, soap_var_class_entry);
add_property_long(&soapvar, "enc_type", enc->details.type); 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); add_property_zval(&soapvar, "enc_value", ret);
parse_namespace(type_name, &cptype, &ns); parse_namespace(type_name, &cptype, &ns);
nsptr = xmlSearchNs(data->doc, data, BAD_CAST(ns)); nsptr = xmlSearchNs(data->doc, data, BAD_CAST(ns));