cvs: php-src(PHP_5_1) /ext/mysqli mysqli_api.c mysqli_nonapi.c mysqli_warning.c php_mysqli.h /ext/mysqli/tests bug34810.phpt
| From: | Antony Dovgal | Date: | Mon, 10 Oct 2005 12:57:55 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /ext/mysqli mysqli_api.c mysqli_nonapi.c mysqli_warning.c php_mysqli.h /ext/mysqli/tests bug34810.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34478@lists.php.net to get a copy of this message | ||
tony2001 Mon Oct 10 08:57:55 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/mysqli/tests bug34810.phpt
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c mysqli_warning.c
php_mysqli.h
Log:
fix #34810 (mysqli::init() and others use wrong $this pointer without checks)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.2&r2=1.118.2.3&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.2 php-src/ext/mysqli/mysqli_api.c:1.118.2.3
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.2 Sun Oct 9 13:03:01 2005
+++ php-src/ext/mysqli/mysqli_api.c Mon Oct 10 08:57:54 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.2 2005/10/09 17:03:01 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.3 2005/10/10 12:57:54 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1033,7 +1033,7 @@
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
mysqli_resource->ptr = (void *)mysql;
- if (!getThis()) {
+ if (!getThis() || !instanceof_function(Z_OBJCE_P(getThis()), mysqli_link_class_entry TSRMLS_CC)) {
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);
} else {
((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr = mysqli_resource;
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54&r2=1.54.2.1&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54 php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.1
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54 Sat Aug 6 12:56:42 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Mon Oct 10 08:57:55 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.54 2005/08/06 16:56:42 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.1 2005/10/10 12:57:55 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -112,7 +112,7 @@
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
mysqli_resource->ptr = (void *)mysql;
- if (!object) {
+ if (!object || !instanceof_function(Z_OBJCE_P(object), mysqli_link_class_entry TSRMLS_CC)) {
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);
} else {
((mysqli_object *) zend_object_store_get_object(object TSRMLS_CC))->ptr = mysqli_resource;
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_warning.c?r1=1.5&r2=1.5.2.1&ty=u
Index: php-src/ext/mysqli/mysqli_warning.c
diff -u php-src/ext/mysqli/mysqli_warning.c:1.5 php-src/ext/mysqli/mysqli_warning.c:1.5.2.1
--- php-src/ext/mysqli/mysqli_warning.c:1.5 Wed Aug 3 10:07:31 2005
+++ php-src/ext/mysqli/mysqli_warning.c Mon Oct 10 08:57:55 2005
@@ -201,8 +201,8 @@
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
mysqli_resource->ptr = mysqli_resource->info = (void *)w;
- if (!getThis()) {
- MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);
+ if (!getThis() || !instanceof_function(Z_OBJCE_P(getThis()), mysqli_warning_class_entry
TSRMLS_CC)) {
+ MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_warning_class_entry);
} else {
((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr = mysqli_resource;
((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->valid = 1;
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.54&r2=1.54.2.1&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.54 php-src/ext/mysqli/php_mysqli.h:1.54.2.1
--- php-src/ext/mysqli/php_mysqli.h:1.54 Wed Aug 3 10:07:31 2005
+++ php-src/ext/mysqli/php_mysqli.h Mon Oct 10 08:57:55 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.54 2005/08/03 14:07:31 sniper Exp $
+ $Id: php_mysqli.h,v 1.54.2.1 2005/10/10 12:57:55 tony2001 Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -191,7 +191,7 @@
#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);\
http://cvs.php.net/co.php/php-src/ext/mysqli/tests/bug34810.phpt?r=1.1&p=1
Index: php-src/ext/mysqli/tests/bug34810.phpt
+++ php-src/ext/mysqli/tests/bug34810.phpt