Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  Fix macro check that I forgot to commit
  Fix UAF in tidy when tidySetErrorBuffer() fails

Author: ndossche

ext/pdo_mysql/mysql_statement.c

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

ext/tidy/tidy.c

@@ -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");
 			}