Skip to content

Commit e0aab74

Browse files
kocsismatekocsismate
committed
Promote DOM invalid state errors during property access
Closes GH-6780
1 parent c732ab4 commit e0aab74

19 files changed

+113
-81
lines changed

‎ext/dom/attr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ int dom_attr_name_read(dom_object *obj, zval *retval)
8181
attrp = (xmlAttrPtr) dom_object_get_node(obj);
8282

8383
if (attrp == NULL) {
84-
php_dom_throw_error(INVALID_STATE_ERR, 0);
84+
php_dom_throw_error(INVALID_STATE_ERR, 1);
8585
return FAILURE;
8686
}
8787

@@ -117,7 +117,7 @@ int dom_attr_value_read(dom_object *obj, zval *retval)
117117
xmlChar *content;
118118

119119
if (attrp == NULL) {
120-
php_dom_throw_error(INVALID_STATE_ERR, 0);
120+
php_dom_throw_error(INVALID_STATE_ERR, 1);
121121
return FAILURE;
122122
}
123123

@@ -138,7 +138,7 @@ int dom_attr_value_write(dom_object *obj, zval *newval)
138138
xmlAttrPtr attrp = (xmlAttrPtr) dom_object_get_node(obj);
139139

140140
if (attrp == NULL) {
141-
php_dom_throw_error(INVALID_STATE_ERR, 0);
141+
php_dom_throw_error(INVALID_STATE_ERR, 1);
142142
return FAILURE;
143143
}
144144

@@ -171,7 +171,7 @@ int dom_attr_owner_element_read(dom_object *obj, zval *retval)
171171
nodep = dom_object_get_node(obj);
172172

173173
if (nodep == NULL) {
174-
php_dom_throw_error(INVALID_STATE_ERR, 0);
174+
php_dom_throw_error(INVALID_STATE_ERR, 1);
175175
return FAILURE;
176176
}
177177

‎ext/dom/characterdata.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ int dom_characterdata_data_read(dom_object *obj, zval *retval)
4141
xmlChar *content;
4242

4343
if (nodep == NULL) {
44-
php_dom_throw_error(INVALID_STATE_ERR, 0);
44+
php_dom_throw_error(INVALID_STATE_ERR, 1);
4545
return FAILURE;
4646
}
4747

@@ -61,7 +61,7 @@ int dom_characterdata_data_write(dom_object *obj, zval *newval)
6161
zend_string *str;
6262

6363
if (nodep == NULL) {
64-
php_dom_throw_error(INVALID_STATE_ERR, 0);
64+
php_dom_throw_error(INVALID_STATE_ERR, 1);
6565
return FAILURE;
6666
}
6767

@@ -90,7 +90,7 @@ int dom_characterdata_length_read(dom_object *obj, zval *retval)
9090
long length = 0;
9191

9292
if (nodep == NULL) {
93-
php_dom_throw_error(INVALID_STATE_ERR, 0);
93+
php_dom_throw_error(INVALID_STATE_ERR, 1);
9494
return FAILURE;
9595
}
9696

‎ext/dom/document.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int dom_document_doctype_read(dom_object *obj, zval *retval)
5555
xmlDtdPtr dtdptr;
5656

5757
if (docp == NULL) {
58-
php_dom_throw_error(INVALID_STATE_ERR, 0);
58+
php_dom_throw_error(INVALID_STATE_ERR, 1);
5959
return FAILURE;
6060
}
6161

@@ -95,7 +95,7 @@ int dom_document_document_element_read(dom_object *obj, zval *retval)
9595
xmlNode *root;
9696

9797
if (docp == NULL) {
98-
php_dom_throw_error(INVALID_STATE_ERR, 0);
98+
php_dom_throw_error(INVALID_STATE_ERR, 1);
9999
return FAILURE;
100100
}
101101

@@ -121,7 +121,7 @@ int dom_document_encoding_read(dom_object *obj, zval *retval)
121121
char *encoding;
122122

123123
if (docp == NULL) {
124-
php_dom_throw_error(INVALID_STATE_ERR, 0);
124+
php_dom_throw_error(INVALID_STATE_ERR, 1);
125125
return FAILURE;
126126
}
127127

@@ -143,7 +143,7 @@ zend_result dom_document_encoding_write(dom_object *obj, zval *newval)
143143
xmlCharEncodingHandlerPtr handler;
144144

145145
if (docp == NULL) {
146-
php_dom_throw_error(INVALID_STATE_ERR, 0);
146+
php_dom_throw_error(INVALID_STATE_ERR, 1);
147147
return FAILURE;
148148
}
149149

@@ -183,7 +183,7 @@ int dom_document_standalone_read(dom_object *obj, zval *retval)
183183
docp = (xmlDocPtr) dom_object_get_node(obj);
184184

185185
if (docp == NULL) {
186-
php_dom_throw_error(INVALID_STATE_ERR, 0);
186+
php_dom_throw_error(INVALID_STATE_ERR, 1);
187187
return FAILURE;
188188
}
189189

@@ -197,7 +197,7 @@ int dom_document_standalone_write(dom_object *obj, zval *newval)
197197
zend_long standalone;
198198

199199
if (docp == NULL) {
200-
php_dom_throw_error(INVALID_STATE_ERR, 0);
200+
php_dom_throw_error(INVALID_STATE_ERR, 1);
201201
return FAILURE;
202202
}
203203

@@ -220,7 +220,7 @@ int dom_document_version_read(dom_object *obj, zval *retval)
220220
char *version;
221221

222222
if (docp == NULL) {
223-
php_dom_throw_error(INVALID_STATE_ERR, 0);
223+
php_dom_throw_error(INVALID_STATE_ERR, 1);
224224
return FAILURE;
225225
}
226226

@@ -241,7 +241,7 @@ int dom_document_version_write(dom_object *obj, zval *newval)
241241
zend_string *str;
242242

243243
if (docp == NULL) {
244-
php_dom_throw_error(INVALID_STATE_ERR, 0);
244+
php_dom_throw_error(INVALID_STATE_ERR, 1);
245245
return FAILURE;
246246
}
247247

@@ -452,7 +452,7 @@ int dom_document_document_uri_read(dom_object *obj, zval *retval)
452452
char *url;
453453

454454
if (docp == NULL) {
455-
php_dom_throw_error(INVALID_STATE_ERR, 0);
455+
php_dom_throw_error(INVALID_STATE_ERR, 1);
456456
return FAILURE;
457457
}
458458

@@ -472,7 +472,7 @@ int dom_document_document_uri_write(dom_object *obj, zval *newval)
472472
zend_string *str;
473473

474474
if (docp == NULL) {
475-
php_dom_throw_error(INVALID_STATE_ERR, 0);
475+
php_dom_throw_error(INVALID_STATE_ERR, 1);
476476
return FAILURE;
477477
}
478478

‎ext/dom/documenttype.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ int dom_documenttype_name_read(dom_object *obj, zval *retval)
3333
xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
3434

3535
if (dtdptr == NULL) {
36-
php_dom_throw_error(INVALID_STATE_ERR, 0);
36+
php_dom_throw_error(INVALID_STATE_ERR, 1);
3737
return FAILURE;
3838
}
3939

@@ -56,7 +56,7 @@ int dom_documenttype_entities_read(dom_object *obj, zval *retval)
5656
dom_object *intern;
5757

5858
if (doctypep == NULL) {
59-
php_dom_throw_error(INVALID_STATE_ERR, 0);
59+
php_dom_throw_error(INVALID_STATE_ERR, 1);
6060
return FAILURE;
6161
}
6262

@@ -84,7 +84,7 @@ int dom_documenttype_notations_read(dom_object *obj, zval *retval)
8484
dom_object *intern;
8585

8686
if (doctypep == NULL) {
87-
php_dom_throw_error(INVALID_STATE_ERR, 0);
87+
php_dom_throw_error(INVALID_STATE_ERR, 1);
8888
return FAILURE;
8989
}
9090

@@ -110,7 +110,7 @@ int dom_documenttype_public_id_read(dom_object *obj, zval *retval)
110110
xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
111111

112112
if (dtdptr == NULL) {
113-
php_dom_throw_error(INVALID_STATE_ERR, 0);
113+
php_dom_throw_error(INVALID_STATE_ERR, 1);
114114
return FAILURE;
115115
}
116116

@@ -135,7 +135,7 @@ int dom_documenttype_system_id_read(dom_object *obj, zval *retval)
135135
xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
136136

137137
if (dtdptr == NULL) {
138-
php_dom_throw_error(INVALID_STATE_ERR, 0);
138+
php_dom_throw_error(INVALID_STATE_ERR, 1);
139139
return FAILURE;
140140
}
141141

@@ -160,7 +160,7 @@ int dom_documenttype_internal_subset_read(dom_object *obj, zval *retval)
160160
xmlDtdPtr intsubset;
161161

162162
if (dtdptr == NULL) {
163-
php_dom_throw_error(INVALID_STATE_ERR, 0);
163+
php_dom_throw_error(INVALID_STATE_ERR, 1);
164164
return FAILURE;
165165
}
166166

‎ext/dom/element.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ int dom_element_tag_name_read(dom_object *obj, zval *retval)
117117
nodep = dom_object_get_node(obj);
118118

119119
if (nodep == NULL) {
120-
php_dom_throw_error(INVALID_STATE_ERR, 0);
120+
php_dom_throw_error(INVALID_STATE_ERR, 1);
121121
return FAILURE;
122122
}
123123

‎ext/dom/entity.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ int dom_entity_public_id_read(dom_object *obj, zval *retval)
4141
xmlEntity *nodep = (xmlEntity *) dom_object_get_node(obj);
4242

4343
if (nodep == NULL) {
44-
php_dom_throw_error(INVALID_STATE_ERR, 0);
44+
php_dom_throw_error(INVALID_STATE_ERR, 1);
4545
return FAILURE;
4646
}
4747

@@ -66,7 +66,7 @@ int dom_entity_system_id_read(dom_object *obj, zval *retval)
6666
xmlEntity *nodep = (xmlEntity *) dom_object_get_node(obj);
6767

6868
if (nodep == NULL) {
69-
php_dom_throw_error(INVALID_STATE_ERR, 0);
69+
php_dom_throw_error(INVALID_STATE_ERR, 1);
7070
return FAILURE;
7171
}
7272

@@ -92,7 +92,7 @@ int dom_entity_notation_name_read(dom_object *obj, zval *retval)
9292
char *content;
9393

9494
if (nodep == NULL) {
95-
php_dom_throw_error(INVALID_STATE_ERR, 0);
95+
php_dom_throw_error(INVALID_STATE_ERR, 1);
9696
return FAILURE;
9797
}
9898

0 commit comments

Comments
 (0)