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.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix GH-21162: pg_connect() on error memory leak.
This commit is contained in:
David Carlier
2026-02-15 21:27:19 +00:00
parent aae3002c28 539c5d9f76
commit 6c8a71b3b7
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/pgsql/pgsql.c
View File

@@ -706,10 +706,12 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
/* create the link */
pgsql = PQconnectdb(connstring);
if (pgsql == NULL || PQstatus(pgsql) == CONNECTION_BAD) {
PHP_PQ_ERROR("Unable to connect to PostgreSQL server: %s", pgsql)
zend_string *msgbuf = _php_pgsql_trim_message(PQerrorMessage(pgsql));
if (pgsql) {
PQfinish(pgsql);
}
php_error_docref(NULL, E_WARNING, "Unable to connect to PostgreSQL server: %s", ZSTR_VAL(msgbuf));
zend_string_release(msgbuf);
goto err;
}
@@ -790,19 +792,23 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
if (connect_type & PGSQL_CONNECT_ASYNC) {
pgsql = PQconnectStart(connstring);
if (pgsql==NULL || PQstatus(pgsql)==CONNECTION_BAD) {
PHP_PQ_ERROR("Unable to connect to PostgreSQL server: %s", pgsql);
zend_string *msgbuf = _php_pgsql_trim_message(PQerrorMessage(pgsql));
if (pgsql) {
PQfinish(pgsql);
}
php_error_docref(NULL, E_WARNING, "Unable to connect to PostgreSQL server: %s", ZSTR_VAL(msgbuf));
zend_string_release(msgbuf);
goto err;
}
} else {
pgsql = PQconnectdb(connstring);
if (pgsql==NULL || PQstatus(pgsql)==CONNECTION_BAD) {
PHP_PQ_ERROR("Unable to connect to PostgreSQL server: %s", pgsql);
zend_string *msgbuf = _php_pgsql_trim_message(PQerrorMessage(pgsql));
if (pgsql) {
PQfinish(pgsql);
}
php_error_docref(NULL, E_WARNING, "Unable to connect to PostgreSQL server: %s", ZSTR_VAL(msgbuf));
zend_string_release(msgbuf);
goto err;
}
}

18
ext/pgsql/tests/gh21162.phpt Normal file
View File

@@ -0,0 +1,18 @@
--TEST--
GH-21162 (pg_connect() on error memory leak)
--EXTENSIONS--
pgsql
--FILE--
<?php
set_error_handler(function (int $errno, string $errstr) {
echo "Warning caught\n";
});
pg_connect('');
echo "Done\n";
?>
--EXPECT--
Warning caught
Done