Skip to content

Commit 3f73916

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
2 parents 9d141f9 + a7de2af commit 3f73916

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/soap/php_encoding.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2267,7 +2267,7 @@ static xmlNodePtr to_xml_array(encodeTypePtr type, zval *data, int style, xmlNod
22672267
} else {
22682268
add_next_index_zval(&array_copy, val);
22692269
}
2270-
Z_ADDREF_P(val);
2270+
Z_TRY_ADDREF_P(val);
22712271

22722272
iter->funcs->move_forward(iter);
22732273
if (EG(exception)) {
@@ -2848,7 +2848,7 @@ static zval *guess_zval_convert(zval *ret, encodeTypePtr type, xmlNodePtr data)
28482848

28492849
object_init_ex(&soapvar, soap_var_class_entry);
28502850
add_property_long(&soapvar, "enc_type", enc->details.type);
2851-
Z_DELREF_P(ret);
2851+
Z_TRY_DELREF_P(ret);
28522852
add_property_zval(&soapvar, "enc_value", ret);
28532853
parse_namespace(type_name, &cptype, &ns);
28542854
nsptr = xmlSearchNs(data->doc, data, BAD_CAST(ns));

0 commit comments

Comments
 (0)