From: Wez Furlong <wez@php.net>
Date: Sat, 2 Aug 2003 11:43:55 +0000 (+0000)
Subject: fix usage of instanceof here too
X-Git-Tag: BEFORE_ARG_INFO~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b6f7bddf4b7cd4905781506009a911edd5e2dcb;p=php

fix usage of instanceof here too
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index f70152a8b7..c22cef4708 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -605,7 +605,10 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC,
 
 			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 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC,
 				}
 
 				return FAILURE;
-			} else {
-				*object = *parameter;
 			}
 
 			EG(argument_stack).top_element++;