Skip to content

Commit 378b015

Browse files
authored
Fix Windows failure (php#14096)
1 parent 4167d75 commit 378b015

File tree

2 files changed

+9
-24
lines changed

2 files changed

+9
-24
lines changed

ext/dom/dom_properties.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ zend_result dom_entity_encoding_read(dom_object *obj, zval *retval);
9090
zend_result dom_entity_version_read(dom_object *obj, zval *retval);
9191

9292
/* entity reference properties */
93-
int dom_entity_reference_child_read(dom_object *obj, zval *retval);
94-
int dom_entity_reference_text_content_read(dom_object *obj, zval *retval);
95-
int dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval);
93+
zend_result dom_entity_reference_child_read(dom_object *obj, zval *retval);
94+
zend_result dom_entity_reference_text_content_read(dom_object *obj, zval *retval);
95+
zend_result dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval);
9696

9797
/* namednodemap properties */
9898
zend_result dom_namednodemap_length_read(dom_object *obj, zval *retval);

ext/dom/entityreference.c

+6-21
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,9 @@ xmlEntityPtr dom_entity_reference_fetch_and_sync_declaration(xmlNodePtr referenc
8080
return entity;
8181
}
8282

83-
int dom_entity_reference_child_read(dom_object *obj, zval *retval)
83+
zend_result dom_entity_reference_child_read(dom_object *obj, zval *retval)
8484
{
85-
xmlNodePtr nodep = dom_object_get_node(obj);
86-
87-
if (nodep == NULL) {
88-
php_dom_throw_error(INVALID_STATE_ERR, true);
89-
return FAILURE;
90-
}
85+
DOM_PROP_NODE(xmlNodePtr, nodep, obj);
9186

9287
xmlEntityPtr entity = dom_entity_reference_fetch_and_sync_declaration(nodep);
9388
if (entity == NULL) {
@@ -99,27 +94,17 @@ int dom_entity_reference_child_read(dom_object *obj, zval *retval)
9994
return SUCCESS;
10095
}
10196

102-
int dom_entity_reference_text_content_read(dom_object *obj, zval *retval)
97+
zend_result dom_entity_reference_text_content_read(dom_object *obj, zval *retval)
10398
{
104-
xmlNodePtr nodep = dom_object_get_node(obj);
105-
106-
if (nodep == NULL) {
107-
php_dom_throw_error(INVALID_STATE_ERR, true);
108-
return FAILURE;
109-
}
99+
DOM_PROP_NODE(xmlNodePtr, nodep, obj);
110100

111101
dom_entity_reference_fetch_and_sync_declaration(nodep);
112102
return dom_node_text_content_read(obj, retval);
113103
}
114104

115-
int dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval)
105+
zend_result dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval)
116106
{
117-
xmlNodePtr nodep = dom_object_get_node(obj);
118-
119-
if (nodep == NULL) {
120-
php_dom_throw_error(INVALID_STATE_ERR, true);
121-
return FAILURE;
122-
}
107+
DOM_PROP_NODE(xmlNodePtr, nodep, obj);
123108

124109
dom_entity_reference_fetch_and_sync_declaration(nodep);
125110
return dom_node_child_nodes_read(obj, retval);

0 commit comments

Comments
 (0)