Skip to content

ext/pdo_pgsql: Clear persistent notice callbacks at shutdown #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iliaal wants to merge 1 commit into from
Closed

ext/pdo_pgsql: Clear persistent notice callbacks at shutdown #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,11 @@ PHP NEWS
. Fixed bug GH-25006 (getColumnMeta() reads out of bounds for an
out-of-range column index). (Ilia Alshanetsky)

- PDO_PGSQL:
. Fixed a use-after-free when a persistent connection receives a notice
after the request that called Pdo\Pgsql::setNoticeCallback() has ended.
(Ilia Alshanetsky)

- PDO_SQLite:
. Fixed bug GH-25021 (SQLite createFunction corrupts large integers).
(mvorisek)
Expand Down
11 changes: 10 additions & 1 deletion ext/pdo_pgsql/pgsql_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1297,6 +1297,15 @@ static const zend_function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, i
}
}

static void pdo_pgsql_request_shutdown(pdo_dbh_t *dbh)
{
pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;

if (H && dbh->refcount <= 2) {
pdo_pgsql_cleanup_notice_callback(H);
}
}

static bool pdo_pgsql_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
{
bool bval;
Expand Down Expand Up @@ -1334,7 +1343,7 @@ static const struct pdo_dbh_methods pgsql_methods = {
pdo_pgsql_get_attribute,
pdo_pgsql_check_liveness, /* check_liveness */
pdo_pgsql_get_driver_methods, /* get_driver_methods */
NULL,
pdo_pgsql_request_shutdown,
pgsql_handle_in_transaction,
NULL, /* get_gc */
pdo_pgsql_scanner
Expand Down
49 changes: 49 additions & 0 deletions ext/pdo_pgsql/tests/pdopgsql_setNoticeCallback_persistent.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
--TEST--
Pdo\Pgsql::setNoticeCallback() does not outlive the request on a persistent connection
--EXTENSIONS--
pdo
pdo_pgsql
--SKIPIF--
<?php
require __DIR__ . '/config.inc';
require dirname(__DIR__, 2) . '/pdo/tests/pdo_test.inc';
PDOTest::skip();
?>
--CONFLICTS--
server
--FILE--
<?php
require __DIR__ . '/config.inc';
include __DIR__ . '/../../../sapi/cli/tests/php_cli_server.inc';

$code = '$db = new Pdo\Pgsql(' . var_export($config['ENV']['PDOTEST_DSN'], true) . ', null, null, [PDO::ATTR_PERSISTENT => true]);' . <<<'PHP'
if (isset($_GET['set'])) {
$db->setNoticeCallback(function ($message) {
echo trim($message), "\n";
});
}
$db->exec("DO $$ BEGIN RAISE NOTICE 'request {$_GET['n']}'; END $$");
echo "request {$_GET['n']} done\n";
PHP;

$args = ['-d', 'extension_dir=' . ini_get('extension_dir')];
foreach (['pdo', 'pdo_pgsql'] as $ext) {
$args[] = '-d';
$args[] = 'extension=' . (PHP_OS_FAMILY === 'Windows' ? 'php_' : '') . $ext . '.' . PHP_SHLIB_SUFFIX;
}
if (php_ini_loaded_file()) {
$args[] = '-c';
$args[] = php_ini_loaded_file();
}
php_cli_server_start($code, 'index.php', $args);

echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/?n=1&set=1');
echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/?n=2');
echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/?n=3&set=1');
?>
--EXPECT--
NOTICE: request 1
request 1 done
request 2 done
NOTICE: request 3
request 3 done
Loading