php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.5'

Browse Source 
* PHP-8.5:
  tidy: Harden against tidyNodeGetText() failure
This commit is contained in:
Niels Dossche
2025-11-05 20:22:54 +01:00
parent 331e6ae548 edcbd4a656
commit 4461e29b65
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/tidy/tidy.c
View File

@@ -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);
@@ -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,