Skip to content

Commit d3a4af4

Browse files
committed
Make zval2myslqnd implementations aware of inheritance
1 parent bcb39d9 commit d3a4af4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/mysqli/mysqli.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_
531531
#include "ext/mysqlnd/mysqlnd_reverse_api.h"
532532
static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC)
533533
{
534-
if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == mysqli_link_class_entry) {
534+
if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry) TSRMLS_CC) {
535535
MY_MYSQL * mysql;
536536
MYSQLI_RESOURCE * my_res;
537537
mysqli_object * intern = (mysqli_object *)zend_object_store_get_object(zv TSRMLS_CC);

ext/pdo_mysql/pdo_mysql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql)
6161
#include "ext/mysqlnd/mysqlnd_reverse_api.h"
6262
static MYSQLND * pdo_mysql_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC)
6363
{
64-
if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == php_pdo_get_dbh_ce()) {
64+
if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), php_pdo_get_dbh_ce() TSRMLS_CC)) {
6565
pdo_dbh_t * dbh = zend_object_store_get_object(zv TSRMLS_CC);
6666

6767
if (!dbh || dbh->driver != &pdo_mysql_driver) {

0 commit comments

Comments
 (0)