Skip to content

Commit 6d762b8

Browse files
committed
Revert and change prior check to assertion
1 parent 0d4abe6 commit 6d762b8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ext/pdo_mysql/pdo_mysql.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ static MYSQLND * pdo_mysql_convert_zv_to_mysqlnd(zval * zv)
6363
if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), php_pdo_get_dbh_ce())) {
6464
pdo_dbh_t * dbh = Z_PDO_DBH_P(zv);
6565

66-
if (!dbh) {
67-
php_error_docref(NULL, E_WARNING, "Failed to retrieve handle from object store");
66+
ZEND_ASSERT(dbh);
67+
68+
if (dbh->driver != &pdo_mysql_driver) {
69+
php_error_docref(NULL, E_WARNING, "Provided PDO instance is not using MySQL but %s", dbh->driver->driver_name);
6870
return NULL;
6971
}
7072

71-
ZEND_ASSERT(dbh->driver == &pdo_mysql_driver);
72-
7373
return ((pdo_mysql_db_handle *)dbh->driver_data)->server;
7474
}
7575
return NULL;

0 commit comments

Comments
 (0)