archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4
Some checks are pending
Push / MACOS_ARM64_DEBUG_NTS (push) Waiting to run
Details
Push / WINDOWS_X64_ZTS (push) Waiting to run
Details
Push / LINUX_X64_RELEASE_NTS (push) Has been skipped
Details
Push / LINUX_X64_DEBUG_ZTS_ASAN (push) Has been skipped
Details
Push / LINUX_X32_DEBUG_ZTS (push) Has been skipped
Details
Push / BENCHMARKING (push) Has been skipped
Details
Push / FREEBSD (push) Has been skipped
Details

Browse source
This commit is contained in:
David Carlier 2025-08-15 08:05:14 +01:00
commit fd4db3e178
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -10,6 +10,10 @@ PHP NEWS
. Fixed bug GH-19245 (Success error message on TLS stream accept failure).
(Jakub Zelenka)
- PGSQL:
. Fixed bug GH-19485 (potential use after free when using persistent pgsql
connections). (Mark Karpeles)
- Standard:
. Fixed bug GH-16649 (UAF during array_splice). (alexandre-daubois)

9
ext/pgsql/pgsql.c
View file

@ -320,6 +320,10 @@ static void _close_pgsql_plink(zend_resource *rsrc)
static void _php_pgsql_notice_handler(void *l, const char *message)
{
if (l == NULL) {
/* This connection does not currently have a valid context, ignore this notice */
return;
}
if (PGG(ignore_notices)) {
return;
}
@ -352,6 +356,11 @@ static int _rollback_transactions(zval *el)
link = (PGconn *) rsrc->ptr;
/* unset notice processor if we initially did set it */
if (PQsetNoticeProcessor(link, NULL, NULL) == _php_pgsql_notice_handler) {
PQsetNoticeProcessor(link, _php_pgsql_notice_handler, NULL);
}
if (PQsetnonblocking(link, 0)) {
php_error_docref("ref.pgsql", E_NOTICE, "Cannot set connection to blocking mode");
return -1;