Skip to content

Commit 79b5b1a

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
2 parents 608f211 + 3f73916 commit 79b5b1a

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
@@ -2234,7 +2234,7 @@ static xmlNodePtr to_xml_array(encodeTypePtr type, zval *data, int style, xmlNod
22342234
} else {
22352235
add_next_index_zval(&array_copy, val);
22362236
}
2237-
Z_ADDREF_P(val);
2237+
Z_TRY_ADDREF_P(val);
22382238

22392239
iter->funcs->move_forward(iter);
22402240
if (EG(exception)) {
@@ -2815,7 +2815,7 @@ static zval *guess_zval_convert(zval *ret, encodeTypePtr type, xmlNodePtr data)
28152815

28162816
object_init_ex(&soapvar, soap_var_class_entry);
28172817
add_property_long(&soapvar, "enc_type", enc->details.type);
2818-
Z_DELREF_P(ret);
2818+
Z_TRY_DELREF_P(ret);
28192819
add_property_zval(&soapvar, "enc_value", ret);
28202820
parse_namespace(type_name, &cptype, &ns);
28212821
nsptr = xmlSearchNs(data->doc, data, BAD_CAST(ns));

0 commit comments

Comments
 (0)