Skip to content

[pull] master from php:master #1147

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

[pull] master from php:master #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58df9fc
Fix UAF in tidy when tidySetErrorBuffer() fails
ndossche Oct 24, 2025
aebe5c9
Fix macro check that I forgot to commit
ndossche Oct 24, 2025
9e4fbb5
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 24, 2025
67926db
Merge branch 'PHP-8.4' into PHP-8.5
ndossche Oct 24, 2025
7455f6a
Merge branch 'PHP-8.5'
ndossche Oct 24, 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
2 changes: 1 addition & 1 deletion ext/pdo_mysql/mysql_statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ext/tidy/tidy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down