Skip to content

Get rid of some unnecessary string conversion #11733

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

Merged
ndossche merged 1 commit into from
Jul 18, 2023
Merged

Get rid of some unnecessary string conversion #11733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions ext/dom/attr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,23 +135,20 @@ int dom_attr_value_read(dom_object *obj, zval *retval)

int dom_attr_value_write(dom_object *obj, zval *newval)
{
zend_string *str;
xmlAttrPtr attrp = (xmlAttrPtr) dom_object_get_node(obj);

if (attrp == NULL) {
php_dom_throw_error(INVALID_STATE_ERR, 1);
return FAILURE;
}

str = zval_try_get_string(newval);
if (UNEXPECTED(!str)) {
return FAILURE;
}
/* Typed property, this is already a string */
ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING);
zend_string *str = Z_STR_P(newval);

dom_remove_all_children((xmlNodePtr) attrp);
xmlNodeSetContentLen((xmlNodePtr) attrp, (xmlChar *) ZSTR_VAL(str), ZSTR_LEN(str));

zend_string_release_ex(str, 0);
return SUCCESS;
}

Expand Down
9 changes: 3 additions & 6 deletions ext/dom/characterdata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,18 @@ int dom_characterdata_data_read(dom_object *obj, zval *retval)
int dom_characterdata_data_write(dom_object *obj, zval *newval)
{
xmlNode *nodep = dom_object_get_node(obj);
zend_string *str;

if (nodep == NULL) {
php_dom_throw_error(INVALID_STATE_ERR, 1);
return FAILURE;
}

str = zval_try_get_string(newval);
if (UNEXPECTED(!str)) {
return FAILURE;
}
/* Typed property, this is already a string */
ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING);
zend_string *str = Z_STR_P(newval);

xmlNodeSetContentLen(nodep, (xmlChar *) ZSTR_VAL(str), ZSTR_LEN(str));

zend_string_release_ex(str, 0);
return SUCCESS;
}

Expand Down
21 changes: 6 additions & 15 deletions ext/dom/node.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,10 +669,9 @@ int dom_node_prefix_write(dom_object *obj, zval *newval)
nsnode = xmlDocGetRootElement(nodep->doc);
}
}
prefix_str = zval_try_get_string(newval);
if (UNEXPECTED(!prefix_str)) {
return FAILURE;
}
/* Typed property, this is already a string */
ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING);
prefix_str = Z_STR_P(newval);

prefix = ZSTR_VAL(prefix_str);
if (nsnode && nodep->ns != NULL && !xmlStrEqual(nodep->ns->prefix, (xmlChar *)prefix)) {
Expand All @@ -698,14 +697,12 @@ int dom_node_prefix_write(dom_object *obj, zval *newval)
}

if (ns == NULL) {
zend_string_release_ex(prefix_str, 0);
php_dom_throw_error(NAMESPACE_ERR, dom_get_strict_error(obj->document));
return FAILURE;
}

xmlSetNs(nodep, ns);
}
zend_string_release_ex(prefix_str, 0);
break;
default:
break;
Expand Down Expand Up @@ -791,21 +788,17 @@ int dom_node_text_content_read(dom_object *obj, zval *retval)
int dom_node_text_content_write(dom_object *obj, zval *newval)
{
xmlNode *nodep = dom_object_get_node(obj);
zend_string *str;

if (nodep == NULL) {
php_dom_throw_error(INVALID_STATE_ERR, 1);
return FAILURE;
}

str = zval_try_get_string(newval);
if (UNEXPECTED(!str)) {
return FAILURE;
}

php_libxml_invalidate_node_list_cache_from_doc(nodep->doc);

const xmlChar *xmlChars = (const xmlChar *) ZSTR_VAL(str);
/* Typed property, this is already a string */
ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING);
const xmlChar *xmlChars = (const xmlChar *) Z_STRVAL_P(newval);
int type = nodep->type;

/* We can't directly call xmlNodeSetContent, because it might encode the string through
Expand All @@ -822,8 +815,6 @@ int dom_node_text_content_write(dom_object *obj, zval *newval)
xmlNodeSetContent(nodep, xmlChars);
}

zend_string_release_ex(str, 0);

return SUCCESS;
}

Expand Down
9 changes: 3 additions & 6 deletions ext/dom/processinginstruction.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,23 +108,20 @@ int dom_processinginstruction_data_read(dom_object *obj, zval *retval)
int dom_processinginstruction_data_write(dom_object *obj, zval *newval)
{
xmlNode *nodep = dom_object_get_node(obj);
zend_string *str;

if (nodep == NULL) {
php_dom_throw_error(INVALID_STATE_ERR, 1);
return FAILURE;
}

str = zval_try_get_string(newval);
if (UNEXPECTED(!str)) {
return FAILURE;
}
/* Typed property, this is already a string */
ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING);
zend_string *str = Z_STR_P(newval);

php_libxml_invalidate_node_list_cache_from_doc(nodep->doc);

xmlNodeSetContentLen(nodep, (xmlChar *) ZSTR_VAL(str), ZSTR_LEN(str));

zend_string_release_ex(str, 0);
return SUCCESS;
}

Expand Down