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.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix UAF in tidy when tidySetErrorBuffer() fails
This commit is contained in:
Niels Dossche
2025-10-24 21:20:43 +02:00
parent aebe5c92a9 58df9fcf98
commit 9e4fbb5ca8
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -82,6 +82,7 @@ PHP NEWS
- Tidy:
. Fixed GH-19021 (improved tidyOptGetCategory detection).
(arjendekorte, David Carlier, Peter Kokot)
. Fix UAF in tidy when tidySetErrorBuffer() fails. (nielsdos)
- XMLReader:
. Fix arginfo/zpp violations when LIBXML_SCHEMAS_ENABLED is not available.

2
ext/tidy/tidy.c
View File

@@ -447,7 +447,7 @@ static zend_object *tidy_object_new(zend_class_entry *class_type, zend_object_ha
efree(intern->ptdoc->errbuf);
tidyRelease(intern->ptdoc->doc);
efree(intern->ptdoc);
efree(intern);
/* TODO: convert to exception */
php_error_docref(NULL, E_ERROR, "Could not set Tidy error buffer");
}