Skip to content

Convert warning to assetion in MySQL PDO driver#6120

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
Girgias wants to merge 2 commits into from
Closed

Convert warning to assetion in MySQL PDO driver #6120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d4abe6
Convert warning to assetion in MySQL PDO driver
Girgias Sep 12, 2020
6d762b8
Revert and change prior check to assertion
Girgias Sep 14, 2020
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: 1 addition & 4 deletions ext/pdo_mysql/pdo_mysql.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,10 +63,7 @@ static MYSQLND * pdo_mysql_convert_zv_to_mysqlnd(zval * zv)
if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), php_pdo_get_dbh_ce())) {
pdo_dbh_t * dbh = Z_PDO_DBH_P(zv);

if (!dbh) {
php_error_docref(NULL, E_WARNING, "Failed to retrieve handle from object store");
return NULL;
}
ZEND_ASSERT(dbh);

if (dbh->driver != &pdo_mysql_driver) {
php_error_docref(NULL, E_WARNING, "Provided PDO instance is not using MySQL but %s", dbh->driver->driver_name);
Expand Down