pgsql: Fix memory leak when first string conversion fails

ndossche · ndossche · commit cf3b70d23cdf · 2025-10-18T23:59:15.000+02:00
If the first string conversion fails, then i==0, but memory was still allocated for `params`. However, we skip freeing `params` when i==0. Closes phpGH-20213.
diff --git a/NEWS b/NEWS
@@ -40,6 +40,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)
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -1057,15 +1057,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
`@@ -1057,15 +1057,13 @@ PHP_FUNCTION(pg_query)`
`1057`	`1057`
`1058`	`1058`	`static void _php_pgsql_free_params(char **params, int num_params)`
`1059`	`1059`	`{`
`1060`		`- if (num_params > 0) {`
`1061`		`- int i;`
`1062`		`- for (i = 0; i < num_params; i++) {`
`1063`		`- if (params[i]) {`
`1064`		`- efree(params[i]);`
`1065`		`- }`
	`1060`	`+ int i;`
	`1061`	`+ for (i = 0; i < num_params; i++) {`
	`1062`	`+ if (params[i]) {`
	`1063`	`+ efree(params[i]);`
`1066`	`1064`	`}`
`1067`		`- efree(params);`
`1068`	`1065`	`}`
	`1066`	`+ efree(params);`
`1069`	`1067`	`}`
`1070`	`1068`
`1071`	`1069`	`/* Execute a query */`