[php-src] master: Move node list dimension handling to a separate file
| From: | Niels Dossche | Date: | Sun, 14 Apr 2024 12:48:39 +0000 |
| Subject: | [php-src] master: Move node list dimension handling to a separate file | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-128094@lists.php.net to get a copy of this message | ||
Author: Niels Dossche (nielsdos)
Date: 2024-04-14T14:45:46+02:00
Commit: https://github.com/php/php-src/commit/53f6e5ecd88eeb480aef3ce1000edcf1e73e6b00
Raw diff: https://github.com/php/php-src/commit/53f6e5ecd88eeb480aef3ce1000edcf1e73e6b00.diff
Move node list dimension handling to a separate file
Changed paths:
M ext/dom/nodelist.c
M ext/dom/php_dom.c
M ext/dom/php_dom.h
Diff:
diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c
index 0a0ab32e5c20..79a5b1753c45 100644
--- a/ext/dom/nodelist.c
+++ b/ext/dom/nodelist.c
@@ -249,4 +249,56 @@ ZEND_METHOD(DOMNodeList, getIterator)
zend_create_internal_iterator_zval(return_value, ZEND_THIS);
}
+static zend_long dom_modern_nodelist_get_index(zval *offset, bool *failed)
+{
+ zend_ulong lval;
+ ZVAL_DEREF(offset);
+ if (Z_TYPE_P(offset) == IS_LONG) {
+ *failed = false;
+ return Z_LVAL_P(offset);
+ } else if (Z_TYPE_P(offset) == IS_DOUBLE) {
+ *failed = false;
+ return zend_dval_to_lval_safe(Z_DVAL_P(offset));
+ } else if (Z_TYPE_P(offset) == IS_STRING && ZEND_HANDLE_NUMERIC(Z_STR_P(offset), lval)) {
+ *failed = false;
+ return (zend_long) lval;
+ } else {
+ *failed = true;
+ return 0;
+ }
+}
+
+zval *dom_modern_nodelist_read_dimension(zend_object *object, zval *offset, int type, zval *rv)
+{
+ if (UNEXPECTED(!offset)) {
+ zend_throw_error(NULL, "Cannot append to %s", ZSTR_VAL(object->ce->name));
+ return NULL;
+ }
+
+ bool failed;
+ zend_long lval = dom_modern_nodelist_get_index(offset, &failed);
+ if (UNEXPECTED(failed)) {
+ zend_illegal_container_offset(object->ce->name, offset, type);
+ return NULL;
+ }
+
+ php_dom_nodelist_get_item_into_zval(php_dom_obj_from_obj(object)->ptr, lval, rv);
+ return rv;
+}
+
+int dom_modern_nodelist_has_dimension(zend_object *object, zval *member, int check_empty)
+{
+ /* If it exists, it cannot be empty because nodes aren't empty. */
+ ZEND_IGNORE_VALUE(check_empty);
+
+ bool failed;
+ zend_long lval = dom_modern_nodelist_get_index(member, &failed);
+ if (UNEXPECTED(failed)) {
+ zend_illegal_container_offset(object->ce->name, member, BP_VAR_IS);
+ return 0;
+ }
+
+ return lval >= 0 && lval <
php_dom_get_nodelist_length(php_dom_obj_from_obj(object));
+}
+
#endif
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index d7cb423cd78c..acf1b5a1e929 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -656,8 +656,6 @@ static zval *dom_nodemap_read_dimension(zend_object *object, zval *offset, int t
static int dom_nodemap_has_dimension(zend_object *object, zval *member, int check_empty);
static zval *dom_modern_nodemap_read_dimension(zend_object *object, zval *offset, int type, zval
*rv);
static int dom_modern_nodemap_has_dimension(zend_object *object, zval *member, int check_empty);
-static zval *dom_modern_nodelist_read_dimension(zend_object *object, zval *offset, int type, zval
*rv);
-static int dom_modern_nodelist_has_dimension(zend_object *object, zval *member, int check_empty);
static zend_object *dom_objects_store_clone_obj(zend_object *zobject);
#ifdef LIBXML_XPATH_ENABLED
@@ -2193,58 +2191,6 @@ static int dom_nodelist_has_dimension(zend_object *object, zval *member, int
che
return offset >= 0 && offset <
php_dom_get_nodelist_length(php_dom_obj_from_obj(object));
}
-static zend_long dom_modern_nodelist_get_index(zval *offset, bool *failed)
-{
- zend_ulong lval;
- ZVAL_DEREF(offset);
- if (Z_TYPE_P(offset) == IS_LONG) {
- *failed = false;
- return Z_LVAL_P(offset);
- } else if (Z_TYPE_P(offset) == IS_DOUBLE) {
- *failed = false;
- return zend_dval_to_lval_safe(Z_DVAL_P(offset));
- } else if (Z_TYPE_P(offset) == IS_STRING && ZEND_HANDLE_NUMERIC(Z_STR_P(offset), lval)) {
- *failed = false;
- return (zend_long) lval;
- } else {
- *failed = true;
- return 0;
- }
-}
-
-static zval *dom_modern_nodelist_read_dimension(zend_object *object, zval *offset, int type, zval
*rv)
-{
- if (UNEXPECTED(!offset)) {
- zend_throw_error(NULL, "Cannot append to %s", ZSTR_VAL(object->ce->name));
- return NULL;
- }
-
- bool failed;
- zend_long lval = dom_modern_nodelist_get_index(offset, &failed);
- if (UNEXPECTED(failed)) {
- zend_illegal_container_offset(object->ce->name, offset, type);
- return NULL;
- }
-
- php_dom_nodelist_get_item_into_zval(php_dom_obj_from_obj(object)->ptr, lval, rv);
- return rv;
-}
-
-static int dom_modern_nodelist_has_dimension(zend_object *object, zval *member, int check_empty)
-{
- /* If it exists, it cannot be empty because nodes aren't empty. */
- ZEND_IGNORE_VALUE(check_empty);
-
- bool failed;
- zend_long lval = dom_modern_nodelist_get_index(member, &failed);
- if (UNEXPECTED(failed)) {
- zend_illegal_container_offset(object->ce->name, member, BP_VAR_IS);
- return 0;
- }
-
- return lval >= 0 && lval <
php_dom_get_nodelist_length(php_dom_obj_from_obj(object));
-}
-
void dom_remove_all_children(xmlNodePtr nodep)
{
if (nodep->children) {
diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h
index a51b5a9cb99b..6806217b5ce3 100644
--- a/ext/dom/php_dom.h
+++ b/ext/dom/php_dom.h
@@ -177,6 +177,9 @@ xmlDocPtr php_dom_create_html_doc(void);
xmlChar *dom_attr_value(const xmlAttr *attr, bool *free);
bool dom_compare_value(const xmlAttr *attr, const xmlChar *value);
+zval *dom_modern_nodelist_read_dimension(zend_object *object, zval *offset, int type, zval *rv);
+int dom_modern_nodelist_has_dimension(zend_object *object, zval *member, int check_empty);
+
typedef enum {
DOM_LOAD_STRING = 0,
DOM_LOAD_FILE = 1,