From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 28 Feb 2014 11:47:12 +0000 (+0400)
Subject: Fixed method argument parsing
X-Git-Tag: POST_PHPNG_MERGE~412^2~486
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0311ad28e460c82e6fb91eb8852fdaf8faba44a;p=php

Fixed method argument parsing
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 8580e5d2b4..1e6a8a443d 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1011,7 +1011,7 @@ ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr
 	zval **object;
 	zend_class_entry *ce;
 
-	if (!this_ptr) {
+	if (!this_ptr || Z_TYPE_P(this_ptr) != IS_OBJECT) {
 		RETURN_IF_ZERO_ARGS(num_args, p, 0);
 
 		va_start(va, type_spec);