1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  pgsql: Fix memory leak when first string conversion fails
This commit is contained in:
Niels Dossche
2025-10-18 23:59:41 +02:00
2 changed files with 8 additions and 7 deletions

3
NEWS
View File

@@ -42,6 +42,9 @@ PHP NEWS
. Fixed bug GH-20121 (JIT broken in ZTS builds on MacOS 15).
(Arnaud, Shivam Mathur)
- PgSql:
. Fix memory leak when first string conversion fails. (nielsdos)
- Phar:
. Fix memory leak of argument in webPhar. (nielsdos)
. Fix memory leak when setAlias() fails. (nielsdos)

View File

@@ -1210,15 +1210,13 @@ PHP_FUNCTION(pg_query)
static void _php_pgsql_free_params(char **params, int num_params)
{
if (num_params > 0) {
int i;
for (i = 0; i < num_params; i++) {
if (params[i]) {
efree(params[i]);
}
int i;
for (i = 0; i < num_params; i++) {
if (params[i]) {
efree(params[i]);
}
efree(params);
}
efree(params);
}
/* Execute a query */