Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit 9282111d9fdb · 2025-10-18T23:59:48.000+02:00
* PHP-8.4:
  pgsql: Fix memory leak when first string conversion fails
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -1225,15 +1225,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 */

Original file line number	Diff line number	Diff line change
`@@ -1225,15 +1225,13 @@ PHP_FUNCTION(pg_query)`
`1225`	`1225`
`1226`	`1226`	`static void _php_pgsql_free_params(char **params, int num_params)`
`1227`	`1227`	`{`
`1228`		`- if (num_params > 0) {`
`1229`		`- int i;`
`1230`		`- for (i = 0; i < num_params; i++) {`
`1231`		`- if (params[i]) {`
`1232`		`- efree(params[i]);`
`1233`		`- }`
	`1228`	`+ int i;`
	`1229`	`+ for (i = 0; i < num_params; i++) {`
	`1230`	`+ if (params[i]) {`
	`1231`	`+ efree(params[i]);`
`1234`	`1232`	`}`
`1235`		`- efree(params);`
`1236`	`1233`	`}`
	`1234`	`+ efree(params);`
`1237`	`1235`	`}`
`1238`	`1236`
`1239`	`1237`	`/* Execute a query */`