archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove dom_nnodemap dtor_obj handler

Browse source 
Don't see any obvious reason why this would have to happen in a
dtor_obj handler. If there is a reason, we're lacking test
coverage for it.
This commit is contained in:
Nikita Popov 2021-06-09 12:31:34 +02:00
parent bc8aa7d0e0
commit 0ce2359233
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ext/dom/php_dom.c
View file

@ -548,7 +548,6 @@ void dom_nnodemap_objects_free_storage(zend_object *object);
static zval *dom_nodelist_read_dimension(zend_object *object, zval *offset, int type, zval *rv); static zval *dom_nodelist_read_dimension(zend_object *object, zval *offset, int type, zval *rv);
static int dom_nodelist_has_dimension(zend_object *object, zval *member, int check_empty); static int dom_nodelist_has_dimension(zend_object *object, zval *member, int check_empty);
static zend_object *dom_objects_store_clone_obj(zend_object *zobject); static zend_object *dom_objects_store_clone_obj(zend_object *zobject);
static void dom_nnodemap_object_dtor(zend_object *object);
#ifdef LIBXML_XPATH_ENABLED #ifdef LIBXML_XPATH_ENABLED
void dom_xpath_objects_free_storage(zend_object *object); void dom_xpath_objects_free_storage(zend_object *object);
#endif #endif
@ -568,7 +567,6 @@ PHP_MINIT_FUNCTION(dom)
memcpy(&dom_nnodemap_object_handlers, &dom_object_handlers, sizeof(zend_object_handlers)); memcpy(&dom_nnodemap_object_handlers, &dom_object_handlers, sizeof(zend_object_handlers));
dom_nnodemap_object_handlers.free_obj = dom_nnodemap_objects_free_storage; dom_nnodemap_object_handlers.free_obj = dom_nnodemap_objects_free_storage;
dom_nnodemap_object_handlers.dtor_obj = dom_nnodemap_object_dtor;
dom_nnodemap_object_handlers.read_dimension = dom_nodelist_read_dimension; dom_nnodemap_object_handlers.read_dimension = dom_nodelist_read_dimension;
dom_nnodemap_object_handlers.has_dimension = dom_nodelist_has_dimension; dom_nnodemap_object_handlers.has_dimension = dom_nodelist_has_dimension;
@ -1050,13 +1048,10 @@ zend_object *dom_xpath_objects_new(zend_class_entry *class_type)
/* }}} */ /* }}} */
#endif #endif
static void dom_nnodemap_object_dtor(zend_object *object) /* {{{ */ void dom_nnodemap_objects_free_storage(zend_object *object) /* {{{ */
{ {
dom_object *intern; dom_object *intern = php_dom_obj_from_obj(object);
dom_nnodemap_object *objmap; dom_nnodemap_object *objmap = (dom_nnodemap_object *)intern->ptr;
intern = php_dom_obj_from_obj(object);
objmap = (dom_nnodemap_object *)intern->ptr;
if (objmap) { if (objmap) {
if (objmap->local) { if (objmap->local) {
@ -1071,12 +1066,6 @@ static void dom_nnodemap_object_dtor(zend_object *object) /* {{{ */
efree(objmap); efree(objmap);
intern->ptr = NULL; intern->ptr = NULL;
} }
}
/* }}} */
void dom_nnodemap_objects_free_storage(zend_object *object) /* {{{ */
{
dom_object *intern = php_dom_obj_from_obj(object);
php_libxml_decrement_doc_ref((php_libxml_node_object *)intern); php_libxml_decrement_doc_ref((php_libxml_node_object *)intern);