From 4fc7026630df42b41c4d86366342998b3fddd6e0 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Sat, 12 Sep 2020 23:53:52 +0200 Subject: [PATCH] Convert warning to assetion in MySQL PDO driver Closes GH-6120 --- ext/pdo_mysql/pdo_mysql.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 73b4ccd7b1..84828edaa4 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -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); -- 2.40.0