php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 06:02:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move node list dimension handling to a separate file

Browse Source
This commit is contained in:
Niels Dossche
2024-04-10 17:35:58 +02:00
parent ac039cf716
commit 53f6e5ecd8
3 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ext/dom/nodelist.c
View File

@@ -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

54
ext/dom/php_dom.c
View File

@@ -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) {

3
ext/dom/php_dom.h
View File

@@ -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,