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

Simplify SimpleXML code for checking if count() is overridden by a userland class (#18722)

Browse Source
This commit is contained in:
Niels Dossche
2025-05-31 15:59:14 +02:00
committed by GitHub
parent 02ebda559d
commit d2514e3969
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ext/simplexml/simplexml.c
View File

@@ -2156,27 +2156,14 @@ static void sxe_object_free_storage(zend_object *object)
/* {{{ php_sxe_find_fptr_count() */
static zend_function* php_sxe_find_fptr_count(zend_class_entry *ce)
{
zend_function *fptr_count = NULL;
zend_class_entry *parent = ce;
int inherited = 0;
while (parent) {
if (parent == ce_SimpleXMLElement) {
break;
}
parent = parent->parent;
inherited = 1;
}
if (inherited) {
/* Find count() method */
fptr_count = zend_hash_find_ptr(&ce->function_table, ZSTR_KNOWN(ZEND_STR_COUNT));
if (fptr_count->common.scope == parent) {
fptr_count = NULL;
if (ce->type == ZEND_USER_CLASS) {
zend_function *fptr_count = zend_hash_find_ptr(&ce->function_table, ZSTR_KNOWN(ZEND_STR_COUNT));
if (fptr_count->common.scope != ce_SimpleXMLElement) {
return fptr_count;
}
}
return fptr_count;
return NULL;
}
/* }}} */