From: Wez Furlong <wez@php.net>
Date: Fri, 1 Aug 2003 17:51:56 +0000 (+0000)
Subject: better fix...
X-Git-Tag: BEFORE_ARG_INFO~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c4de2664c16da98ee0818e5cf2240f8e2aff787;p=php

better fix...
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index e794cacdcc..f70152a8b7 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -393,14 +393,17 @@ static char *zend_parse_arg_impl(zval **arg, va_list *va, char **spec TSRMLS_DC)
 			{
 				zval **p = va_arg(*va, zval **);
 				zend_class_entry *ce = va_arg(*va, zend_class_entry *);
-				if (!instanceof_function(Z_OBJCE_PP(arg), ce TSRMLS_CC)) {
+
+				if (Z_TYPE_PP(arg) == IS_OBJECT &&
+						instanceof_function(Z_OBJCE_PP(arg), ce TSRMLS_CC)) {
+					*p = *arg;
+				} else {
 					if (Z_TYPE_PP(arg) == IS_NULL && return_null) {
 						*p = NULL;
 					} else {
 						return ce->name;
 					}
-				} else
-					*p = *arg;
+				}
 			}
 			break;