Skip to content

[pull] master from php:master #516

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
pull merged 5 commits into from
Nov 5, 2025
Merged

[pull] master from php:master #516

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
331e6ae
tidy: Avoid some work when creating attributes (#20390)
ndossche Nov 5, 2025
0584e59
tidy: Harden against tidyNodeGetText() failure
ndossche Nov 4, 2025
ad248cf
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Nov 5, 2025
edcbd4a
Merge branch 'PHP-8.4' into PHP-8.5
ndossche Nov 5, 2025
4461e29
Merge branch 'PHP-8.5'
ndossche Nov 5, 2025
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
11 changes: 6 additions & 5 deletions ext/tidy/tidy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,7 @@ static zend_result tidy_node_cast_handler(zend_object *in, zval *out, int type)
case IS_STRING:
obj = php_tidy_fetch_object(in);
tidyBufInit(&buf);
if (obj->ptdoc) {
tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
if (obj->ptdoc && tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf)) {
ZVAL_STRINGL(out, (const char *) buf.bp, buf.size-1);
} else {
ZVAL_EMPTY_STRING(out);
Expand Down Expand Up @@ -530,7 +529,7 @@ static void tidy_add_node_default_properties(PHPTidyObj *obj)
const char *name;

tidyBufInit(&buf);
tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
(void) tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);

zend_update_property_stringl(
tidy_ce_node,
Expand Down Expand Up @@ -616,12 +615,14 @@ static void tidy_add_node_default_properties(PHPTidyObj *obj)
do {
const char *attr_name = tidyAttrName(tempattr);
if (attr_name) {
zval value;
const char *val = tidyAttrValue(tempattr);
if (val) {
add_assoc_string(&attribute, attr_name, val);
ZVAL_STRING_FAST(&value, val);
} else {
add_assoc_str(&attribute, attr_name, zend_empty_string);
ZVAL_EMPTY_STRING(&value);
}
zend_hash_str_add_new(Z_ARRVAL(attribute), attr_name, strlen(attr_name), &value);
}
} while((tempattr = tidyAttrNext(tempattr)));
} else {
Expand Down