Skip to content

Cleanedup 9628 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ndossche wants to merge 3 commits into from
Closed

Cleanedup 9628 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4def283
Add tests for delayed freeing (with wrong output)
ndossche Jul 2, 2023
d18c3f1
Change the way lifetime works in ext/libxml and ext/dom
ndossche Jul 2, 2023
3653472
Cleanup macro usage in ext/dom and ext/libxml
ndossche Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions ext/dom/characterdata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,15 +330,13 @@ PHP_METHOD(DOMCharacterData, replaceData)

PHP_METHOD(DOMCharacterData, remove)
{
zval *id = ZEND_THIS;
xmlNodePtr child;
dom_object *intern;

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}

DOM_GET_OBJ(child, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_child_node_remove(intern);
RETURN_NULL();
Expand All @@ -347,50 +345,44 @@ PHP_METHOD(DOMCharacterData, remove)
PHP_METHOD(DOMCharacterData, after)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_after(intern, args, argc);
}

PHP_METHOD(DOMCharacterData, before)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_before(intern, args, argc);
}

PHP_METHOD(DOMCharacterData, replaceWith)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_after(intern, args, argc);
dom_child_node_remove(intern);
Expand Down
32 changes: 9 additions & 23 deletions ext/dom/document.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,18 +772,15 @@ PHP_METHOD(DOMDocument, createEntityReference)
*/
PHP_METHOD(DOMDocument, getElementsByTagName)
{
zval *id;
xmlDocPtr docp;
size_t name_len;
dom_object *intern, *namednode;
char *name;

id = ZEND_THIS;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
DOM_GET_THIS_INTERN(intern);

php_dom_create_iterator(return_value, DOM_NODELIST);
namednode = Z_DOMOBJ_P(return_value);
Expand All @@ -796,7 +793,7 @@ Since: DOM Level 2
*/
PHP_METHOD(DOMDocument, importNode)
{
zval *id, *node;
zval *node;
xmlDocPtr docp;
xmlNodePtr nodep, retnodep;
dom_object *intern, *nodeobj;
Expand All @@ -805,12 +802,11 @@ PHP_METHOD(DOMDocument, importNode)
/* See http://www.xmlsoft.org/html/libxml-tree.html#xmlDocCopyNode for meaning of values */
int extended_recursive;

id = ZEND_THIS;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|b", &node, dom_node_class_entry, &recursive) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
DOM_GET_OBJ(docp, ZEND_THIS, xmlDocPtr, intern);

DOM_GET_OBJ(nodep, node, xmlNodePtr, nodeobj);

Expand Down Expand Up @@ -982,18 +978,15 @@ Since: DOM Level 2
*/
PHP_METHOD(DOMDocument, getElementsByTagNameNS)
{
zval *id;
xmlDocPtr docp;
size_t uri_len, name_len;
dom_object *intern, *namednode;
char *uri, *name;

id = ZEND_THIS;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!s", &uri, &uri_len, &name, &name_len) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
DOM_GET_THIS_INTERN(intern);

php_dom_create_iterator(return_value, DOM_NODELIST);
namednode = Z_DOMOBJ_P(return_value);
Expand Down Expand Up @@ -2130,18 +2123,15 @@ PHP_METHOD(DOMDocument, saveHTML)
/* {{{ Register extended class used to create base node type */
PHP_METHOD(DOMDocument, registerNodeClass)
{
zval *id;
xmlDoc *docp;
zend_class_entry *basece = dom_node_class_entry, *ce = NULL;
dom_object *intern;

id = ZEND_THIS;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "CC!", &basece, &ce) == FAILURE) {
RETURN_THROWS();
}

if (ce == NULL || instanceof_function(ce, basece)) {
DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
DOM_GET_THIS_INTERN(intern);
dom_set_doc_classmap(intern->document, basece, ce);
RETURN_TRUE;
}
Expand All @@ -2156,16 +2146,14 @@ Since: DOM Living Standard (DOM4)
PHP_METHOD(DOMDocument, append)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_append(intern, args, argc);
}
Expand All @@ -2177,16 +2165,14 @@ Since: DOM Living Standard (DOM4)
PHP_METHOD(DOMDocument, prepend)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_prepend(intern, args, argc);
}
Expand Down
12 changes: 4 additions & 8 deletions ext/dom/documentfragment.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,14 @@ Since: DOM Living Standard (DOM4)
PHP_METHOD(DOMDocumentFragment, append)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_append(intern, args, argc);
}
Expand All @@ -119,16 +117,14 @@ Since: DOM Living Standard (DOM4)
PHP_METHOD(DOMDocumentFragment, prepend)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_prepend(intern, args, argc);
}
Expand Down
45 changes: 13 additions & 32 deletions ext/dom/element.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,18 +495,15 @@ PHP_METHOD(DOMElement, removeAttributeNode)
*/
PHP_METHOD(DOMElement, getElementsByTagName)
{
zval *id;
xmlNodePtr elemp;
size_t name_len;
dom_object *intern, *namednode;
char *name;

id = ZEND_THIS;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_OBJ(elemp, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

php_dom_create_iterator(return_value, DOM_NODELIST);
namednode = Z_DOMOBJ_P(return_value);
Expand Down Expand Up @@ -900,18 +897,15 @@ Since: DOM Level 2
*/
PHP_METHOD(DOMElement, getElementsByTagNameNS)
{
zval *id;
xmlNodePtr elemp;
size_t uri_len, name_len;
dom_object *intern, *namednode;
char *uri, *name;

id = ZEND_THIS;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!s", &uri, &uri_len, &name, &name_len) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_OBJ(elemp, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

php_dom_create_iterator(return_value, DOM_NODELIST);
namednode = Z_DOMOBJ_P(return_value);
Expand Down Expand Up @@ -1115,16 +1109,13 @@ PHP_METHOD(DOMElement, setIdAttributeNode)
*/
PHP_METHOD(DOMElement, remove)
{
zval *id;
xmlNodePtr child;
dom_object *intern;

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(child, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_child_node_remove(intern);
}
Expand All @@ -1133,33 +1124,29 @@ PHP_METHOD(DOMElement, remove)
PHP_METHOD(DOMElement, after)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_after(intern, args, argc);
}

PHP_METHOD(DOMElement, before)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_before(intern, args, argc);
}
Expand All @@ -1170,16 +1157,14 @@ Since: DOM Living Standard (DOM4)
PHP_METHOD(DOMElement, append)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_append(intern, args, argc);
}
Expand All @@ -1191,16 +1176,14 @@ Since: DOM Living Standard (DOM4)
PHP_METHOD(DOMElement, prepend)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_parent_node_prepend(intern, args, argc);
}
Expand All @@ -1212,16 +1195,14 @@ Since: DOM Living Standard (DOM4)
PHP_METHOD(DOMElement, replaceWith)
{
uint32_t argc;
zval *args, *id;
zval *args;
dom_object *intern;
xmlNode *context;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

id = ZEND_THIS;
DOM_GET_OBJ(context, id, xmlNodePtr, intern);
DOM_GET_THIS_INTERN(intern);

dom_child_replace_with(intern, args, argc);
}
Expand Down
4 changes: 0 additions & 4 deletions ext/dom/php_dom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,6 @@ zval *dom_read_property(zend_object *object, zend_string *name, int type, void *

if (obj->prop_handler != NULL) {
hnd = zend_hash_find_ptr(obj->prop_handler, name);
} else if (instanceof_function(obj->std.ce, dom_node_class_entry)) {
zend_throw_error(NULL, "Couldn't fetch %s. Node no longer exists", ZSTR_VAL(obj->std.ce->name));
retval = &EG(uninitialized_zval);
return retval;
}

if (hnd) {
Expand Down
Loading