cvs: ZendEngine2 / zend_API.c
| From: | Wez Furlong | Date: | Sat, 02 Aug 2003 11:43:55 +0000 |
| Subject: | cvs: ZendEngine2 / zend_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-1569@lists.php.net to get a copy of this message | ||
wez Sat Aug 2 07:43:55 2003 EDT
Modified files:
/ZendEngine2 zend_API.c
Log:
fix usage of instanceof here too
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.188 ZendEngine2/zend_API.c:1.189
--- ZendEngine2/zend_API.c:1.188 Fri Aug 1 13:51:56 2003
+++ ZendEngine2/zend_API.c Sat Aug 2 07:43:55 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.188 2003/08/01 17:51:56 wez Exp $ */
+/* $Id: zend_API.c,v 1.189 2003/08/02 11:43:55 wez Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -605,7 +605,10 @@
return FAILURE;
} else {
- if (!instanceof_function(Z_OBJCE_PP(parameter), ce TSRMLS_CC)) {
+ if (Z_TYPE_PP(parameter) == IS_OBJECT &&
+ instanceof_function(Z_OBJCE_PP(parameter), ce TSRMLS_CC)) {
+ *object = *parameter;
+ } else {
if (!quiet) {
zend_error(E_WARNING, "%s() expects parameter 1 to be %s, %s given",
get_active_function_name(TSRMLS_C), ce->name,
@@ -613,8 +616,6 @@
}
return FAILURE;
- } else {
- *object = *parameter;
}
EG(argument_stack).top_element++;