Skip to content

Commit 4461e29

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: tidy: Harden against tidyNodeGetText() failure
2 parents 331e6ae + edcbd4a commit 4461e29

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

ext/tidy/tidy.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,7 @@ static zend_result tidy_node_cast_handler(zend_object *in, zval *out, int type)
473473
case IS_STRING:
474474
obj = php_tidy_fetch_object(in);
475475
tidyBufInit(&buf);
476-
if (obj->ptdoc) {
477-
tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
476+
if (obj->ptdoc && tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf)) {
478477
ZVAL_STRINGL(out, (const char *) buf.bp, buf.size-1);
479478
} else {
480479
ZVAL_EMPTY_STRING(out);
@@ -530,7 +529,7 @@ static void tidy_add_node_default_properties(PHPTidyObj *obj)
530529
const char *name;
531530

532531
tidyBufInit(&buf);
533-
tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
532+
(void) tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
534533

535534
zend_update_property_stringl(
536535
tidy_ce_node,

0 commit comments

Comments
 (0)