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:
  Fix macro check that I forgot to commit
  Fix UAF in tidy when tidySetErrorBuffer() fails
This commit is contained in:
Niels Dossche
2025-10-24 21:20:58 +02:00
parent eafbc6b3e6 67926db749
commit 7455f6a5b0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/pdo_mysql/mysql_statement.c
View File

@@ -748,7 +748,7 @@ static char *type_to_name_native(int type) /* {{{ */
PDO_MYSQL_NATIVE_TYPE_NAME(NEWDATE)
#endif
/* The following 2 don't have BC FIELD_TYPE_* aliases. */
#if MYSQL_VERSION_ID >= 90000 && !defined(MARIADB_BASE_VERSION) /* TODO: mysqlnd support (added in 8.4 via a1ab846231aeff49c0441a30ebd44463fc7825b1) */
#if (MYSQL_VERSION_ID >= 90000 && !defined(MARIADB_BASE_VERSION)) || defined(PDO_USE_MYSQLND)
PDO_MYSQL_NATIVE_TYPE_NAME(VECTOR)
#endif
#if MYSQL_VERSION_ID >= 50708 || defined(PDO_USE_MYSQLND)

2
ext/tidy/tidy.c
View File

@@ -387,7 +387,7 @@ static zend_object *tidy_object_new(zend_class_entry *class_type, const zend_obj
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");
}