Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit d992cd8315b8 · 2025-10-18T23:59:41.000+02:00
* PHP-8.3:
  pgsql: Fix memory leak when first string conversion fails
diff --git a/NEWS b/NEWS
@@ -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)
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -1210,15 +1210,13 @@ PHP_FUNCTION(pg_query)`
`1210`	`1210`
`1211`	`1211`	`static void _php_pgsql_free_params(char **params, int num_params)`
`1212`	`1212`	`{`
`1213`		`- if (num_params > 0) {`
`1214`		`- int i;`
`1215`		`- for (i = 0; i < num_params; i++) {`
`1216`		`- if (params[i]) {`
`1217`		`- efree(params[i]);`
`1218`		`- }`
	`1213`	`+ int i;`
	`1214`	`+ for (i = 0; i < num_params; i++) {`
	`1215`	`+ if (params[i]) {`
	`1216`	`+ efree(params[i]);`
`1219`	`1217`	`}`
`1220`		`- efree(params);`
`1221`	`1218`	`}`
	`1219`	`+ efree(params);`
`1222`	`1220`	`}`
`1223`	`1221`
`1224`	`1222`	`/* Execute a query */`