diff options
| author | Dmitry Stogov <dmitry@php.net> | 2009-01-14 11:56:08 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2009-01-14 11:56:08 +0000 |
| commit | 5d060ebe05b6bf2a3ae76054d7db8828baa0cb6f (patch) | |
| tree | 8df701957b20261d43942732f8256e141fcec05a /Zend/zend_API.c | |
| parent | ab61459f61d5458886892fa810d30cd055af649f (diff) | |
| download | php-git-5d060ebe05b6bf2a3ae76054d7db8828baa0cb6f.tar.gz | |
Fixed __call() to be invoked on private/protected method access through callbacks
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 51 |
1 files changed, 38 insertions, 13 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 504a5e5a31..96315fb7b8 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2480,20 +2480,45 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca fcc->function_handler = priv_fbc; } } - } else if (fcc->object_ptr) { - if (Z_OBJ_HT_P(fcc->object_ptr)->get_method) { - fcc->function_handler = Z_OBJ_HT_P(fcc->object_ptr)->get_method(&fcc->object_ptr, mname, mlen TSRMLS_CC); - retval = fcc->function_handler ? 1 : 0; - call_via_handler = 1; - } - } else if (fcc->calling_scope) { - if (fcc->calling_scope->get_static_method) { - fcc->function_handler = fcc->calling_scope->get_static_method(fcc->calling_scope, mname, mlen TSRMLS_CC); - } else { - fcc->function_handler = zend_std_get_static_method(fcc->calling_scope, mname, mlen TSRMLS_CC); + if ((check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0 && + (fcc->calling_scope && + (fcc->calling_scope->__call || + 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)) { + retval = 0; + fcc->function_handler = NULL; + goto get_function_via_handler; + } + } else if (fcc->function_handler->common.fn_flags & ZEND_ACC_PROTECTED) { + if (!zend_check_protected(fcc->function_handler->common.scope, EG(scope))) { + retval = 0; + fcc->function_handler = NULL; + goto get_function_via_handler; + } + } + } + } else { +get_function_via_handler: + if (fcc->object_ptr) { + if (Z_OBJ_HT_P(fcc->object_ptr)->get_method) { + fcc->function_handler = Z_OBJ_HT_P(fcc->object_ptr)->get_method(&fcc->object_ptr, mname, mlen TSRMLS_CC); + if (fcc->function_handler) { + retval = 1; + call_via_handler = (fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0; + } + } + } else if (fcc->calling_scope) { + if (fcc->calling_scope->get_static_method) { + fcc->function_handler = fcc->calling_scope->get_static_method(fcc->calling_scope, mname, mlen TSRMLS_CC); + } else { + fcc->function_handler = zend_std_get_static_method(fcc->calling_scope, mname, mlen TSRMLS_CC); + } + if (fcc->function_handler) { + retval = 1; + call_via_handler = (fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0; + } } - retval = fcc->function_handler ? 1 : 0; - call_via_handler = 1; } if (retval) { |