diff options
author | Antony Dovgal <tony2001@php.net> | 2005-10-10 12:59:47 +0000 |
---|---|---|
committer | Antony Dovgal <tony2001@php.net> | 2005-10-10 12:59:47 +0000 |
commit | 5ec88f863ec519052083edc0cfe7e375bb60a473 (patch) | |
tree | 5b22e1809a150e92513692e40ca3a9c17df8c357 /ext/mysqli/php_mysqli.h | |
parent | 98294fbf3f786417c57b65bd11040694cce9f5d1 (diff) | |
download | php-git-5ec88f863ec519052083edc0cfe7e375bb60a473.tar.gz |
MF51: fix #34810 (mysqli::init() and others use wrong $this pointer without checks)
Diffstat (limited to 'ext/mysqli/php_mysqli.h')
-rw-r--r-- | ext/mysqli/php_mysqli.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h index 4298ebf851..5999d12551 100644 --- a/ext/mysqli/php_mysqli.h +++ b/ext/mysqli/php_mysqli.h @@ -191,7 +191,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML #define MYSQLI_REGISTER_RESOURCE(__ptr, __ce) \ {\ zval *object = getThis();\ - if (!object) {\ + if (!object || !instanceof_function(Z_OBJCE_P(object), mysqli_link_class_entry TSRMLS_CC)) {\ object = return_value;\ Z_TYPE_P(object) = IS_OBJECT;\ (object)->value.obj = mysqli_objects_new(__ce TSRMLS_CC);\ |