Merge branch 'PHP-8.1' into PHP-8.2

Girgias · Girgias · commit 30b550bad506 · 2023-09-02T23:01:08.000+01:00
* PHP-8.1:
  Fix memory leak with failed SQLPrepare
diff --git a/NEWS b/NEWS
@@ -20,6 +20,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-10270 (Invalid error message when connection via SSL fails:
     "trying to connect via (null)"). (Kamil Tekiela)
 
+- ODBC:
+  . Fixed memory leak with failed SQLPrepare. (NattyNarwhal)
+
 - SPL:
   . Fixed bug GH-11972 (RecursiveCallbackFilterIterator regression in 8.1.18).
     (nielsdos)
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -845,6 +845,7 @@ PHP_FUNCTION(odbc_prepare)
 			break;
 		default:
 			odbc_sql_error(conn, result->stmt, "SQLPrepare");
+			efree(result);
 			RETURN_FALSE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -845,6 +845,7 @@ PHP_FUNCTION(odbc_prepare)`
`845`	`845`	`break;`
`846`	`846`	`default:`
`847`	`847`	`odbc_sql_error(conn, result->stmt, "SQLPrepare");`
	`848`	`+ efree(result);`
`848`	`849`	`RETURN_FALSE;`
`849`	`850`	`}`
`850`	`851`