Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Fix memory leak with failed SQLPrepare
This commit is contained in:
George Peter Banyard 2023-09-02 23:00:48 +01:00
commit 30b550bad5
2 changed files with 4 additions and 0 deletions

3
NEWS
View file

@ -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)

View file

@ -845,6 +845,7 @@ PHP_FUNCTION(odbc_prepare)
break;
default:
odbc_sql_error(conn, result->stmt, "SQLPrepare");
efree(result);
RETURN_FALSE;
}