php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source 
* PHP-8.2:
  Fix memory leak with failed SQLPrepare
This commit is contained in:
George Peter Banyard
2023-09-02 23:01:40 +01:00
parent c5fb8b6a6b 30b550bad5
commit 508e70ac3c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -11,6 +11,9 @@ PHP NEWS
. Fixed GH-12077 (PHP 8.3.0RC1 borked socket-close-on-exec.phpt). . Fixed GH-12077 (PHP 8.3.0RC1 borked socket-close-on-exec.phpt).
(Jakub Zelenka) (Jakub Zelenka)
- ODBC:
. Fixed memory leak with failed SQLPrepare. (NattyNarwhal)
- SPL: - SPL:
. Fixed bug GH-11972 (RecursiveCallbackFilterIterator regression in 8.1.18). . Fixed bug GH-11972 (RecursiveCallbackFilterIterator regression in 8.1.18).
(nielsdos) (nielsdos)

1
ext/odbc/php_odbc.c
View File

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