diff options
| author | David Soria Parra <dsp@php.net> | 2013-06-24 17:22:02 +0200 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2013-06-24 17:22:02 +0200 |
| commit | a496e62f1342b0ae22163b57fa0c6f5df4d5a1f5 (patch) | |
| tree | 50a116b69371ccd1f39a5ed87c21988f3d5bedc5 /Zend | |
| parent | 8e4e38aaeea0944a976fd2629c210c87483dcb3f (diff) | |
| parent | ecd9d7625098bfc0a14ffa1fc39535848e71fc80 (diff) | |
| download | php-git-a496e62f1342b0ae22163b57fa0c6f5df4d5a1f5.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix #65108 (is_callable() triggers Fatal Error)
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 56c7c245b5..439d80913f 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2842,7 +2842,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca } if ((check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0 && (fcc->calling_scope && - (fcc->calling_scope->__call || + ((fcc->calling_scope->__call && fcc->object_ptr) || fcc->calling_scope->__callstatic))) { if (fcc->function_handler->op_array.fn_flags & ZEND_ACC_PRIVATE) { if (!zend_check_private(fcc->function_handler, fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : EG(scope), lmname, mlen TSRMLS_CC)) { |