summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-04-11 14:24:04 +0300
committerDmitry Stogov <dmitry@zend.com>2019-04-11 14:24:04 +0300
commita1b7ccdfc69a1ad9938039f687ad7059ed1bd506 (patch)
tree28633d4a2ed4da30bee06992f9e2010d26db0457 /Zend/zend_API.c
parentcd8312a77e5f5fee62949ecb22664e8b24013c01 (diff)
downloadphp-git-a1b7ccdfc69a1ad9938039f687ad7059ed1bd506.tar.gz
Fixed bug #77877 (call_user_func() passes $this to satatic methods).
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 881ee27a03..20b5fbb3b4 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3170,6 +3170,10 @@ get_function_via_handler:
if (fcc->object) {
fcc->called_scope = fcc->object->ce;
+ if (fcc->function_handler
+ && fcc->function_handler->common.fn_flags & ZEND_ACC_STATIC) {
+ fcc->object = NULL;
+ }
}
return retval;
}