From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 3 Oct 2005 09:10:28 +0000 (+0000)
Subject: Fixed bug #34678 (__call(), is_callable() and static methods)
X-Git-Tag: RELEASE_0_9_0~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdb1746ac31249755a7d84e1c425416d47921405;p=php

Fixed bug #34678 (__call(), is_callable() and static methods)
---

diff --git a/Zend/tests/bug34678.phpt b/Zend/tests/bug34678.phpt
new file mode 100755
index 0000000000..2a13201f26
--- /dev/null
+++ b/Zend/tests/bug34678.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #34678 (__call(), is_callable() and static methods)
+--FILE--
+<?php
+class A {
+	public function __call($m, $a) {
+		echo "__call\n";
+	}
+}
+
+class B extends A {
+	public static function foo() {
+		echo "foo\n";
+	}
+}
+
+if (is_callable(array('B', 'foo'))) {
+	call_user_func(array('B', 'foo'));
+}
+if (is_callable(array('A', 'foo'))) {
+	call_user_func(array('A', 'foo'));
+}
+?>
+--EXPECT--
+foo
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 22d43f5226..c7e1a3f6ee 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2726,7 +2726,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, uint check_flags, zval *c
 							}
 						}
 						/* check for __call too */
-						if (retval == 0 && ce->__call != 0) {
+						if (retval == 0 && *zobj_ptr_ptr && ce->__call != 0) {
 							retval = 1;
 						}
 						efree(lcname);