From 8ef4ac5ebbf107dd5bf0a9266b7284ea46a7b644 Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Wed, 7 Jan 2009 22:13:07 +0000 Subject: [PATCH] MFB --- Zend/zend_object_handlers.c | 59 ++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index a38887bb60..75d2f1c272 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -789,6 +789,28 @@ static inline zend_class_entry * zend_get_function_root_class(zend_function *fbc } /* }}} */ +static inline union _zend_function *zend_get_user_call_function(zend_object *zobj, zstr method_name, int method_len) /* {{{ */ +{ + zend_internal_function *call_user_call = emalloc(sizeof(zend_internal_function)); + call_user_call->type = ZEND_INTERNAL_FUNCTION; + call_user_call->module = zobj->ce->module; + call_user_call->handler = zend_std_call_user_call; + call_user_call->arg_info = NULL; + call_user_call->num_args = 0; + call_user_call->scope = zobj->ce; + call_user_call->fn_flags = ZEND_ACC_CALL_VIA_HANDLER; + if (UG(unicode)) { + call_user_call->function_name.u = eustrndup(method_name.u, method_len); + } else { + call_user_call->function_name.s = estrndup(method_name.s, method_len); + } + call_user_call->pass_rest_by_reference = 0; + call_user_call->return_reference = ZEND_RETURN_VALUE; + + return (union _zend_function *)call_user_call; +} +/* }}} */ + static union _zend_function *zend_std_get_method(zval **object_ptr, zstr method_name, int method_len TSRMLS_DC) /* {{{ */ { zend_object *zobj; @@ -807,23 +829,7 @@ static union _zend_function *zend_std_get_method(zval **object_ptr, zstr method_ if (zend_u_hash_find(&zobj->ce->function_table, type, lc_method_name, lc_method_name_len+1, (void **)&fbc) == FAILURE) { efree(lc_method_name.v); if (zobj->ce->__call) { - zend_internal_function *call_user_call = emalloc(sizeof(zend_internal_function)); - call_user_call->type = ZEND_INTERNAL_FUNCTION; - call_user_call->module = zobj->ce->module; - call_user_call->handler = zend_std_call_user_call; - call_user_call->arg_info = NULL; - call_user_call->num_args = 0; - call_user_call->scope = zobj->ce; - call_user_call->fn_flags = ZEND_ACC_CALL_VIA_HANDLER; - if (UG(unicode)) { - call_user_call->function_name.u = eustrndup(method_name.u, method_len); - } else { - call_user_call->function_name.s = estrndup(method_name.s, method_len); - } - call_user_call->pass_rest_by_reference = 0; - call_user_call->return_reference = ZEND_RETURN_VALUE; - - return (union _zend_function *)call_user_call; + return zend_get_user_call_function(zobj, method_name, method_len); } else { return NULL; } @@ -834,12 +840,18 @@ static union _zend_function *zend_std_get_method(zval **object_ptr, zstr method_ zend_function *updated_fbc; /* Ensure that if we're calling a private function, we're allowed to do so. + * If we're not and __call() handler exists, invoke it, otherwise error out. */ updated_fbc = zend_check_private_int(fbc, Z_OBJ_HANDLER_P(object, get_class_entry)(object TSRMLS_CC), lc_method_name, method_len TSRMLS_CC); - if (!updated_fbc) { - zend_error(E_ERROR, "Call to %s method %v::%v() from context '%v'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name, EG(scope) ? EG(scope)->name : EMPTY_ZSTR); + if (updated_fbc) { + fbc = updated_fbc; + } else { + if (zobj->ce->__call) { + fbc = zend_get_user_call_function(zobj, method_name, method_len); + } else { + zend_error(E_ERROR, "Call to %s method %v::%v() from context '%v'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name, EG(scope) ? EG(scope)->name : EMPTY_ZSTR); + } } - fbc = updated_fbc; } else { /* Ensure that we haven't overridden a private function and end up calling * the overriding public function... @@ -857,9 +869,14 @@ static union _zend_function *zend_std_get_method(zval **object_ptr, zstr method_ } if ((fbc->common.fn_flags & ZEND_ACC_PROTECTED)) { /* Ensure that if we're calling a protected function, we're allowed to do so. + * If we're not and __call() handler exists, invoke it, otherwise error out. */ if (!zend_check_protected(zend_get_function_root_class(fbc), EG(scope))) { - zend_error(E_ERROR, "Call to %s method %v::%v() from context '%v'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name, EG(scope) ? EG(scope)->name : EMPTY_ZSTR); + if (zobj->ce->__call) { + fbc = zend_get_user_call_function(zobj, method_name, method_len); + } else { + zend_error(E_ERROR, "Call to %s method %v::%v() from context '%v'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name, EG(scope) ? EG(scope)->name : EMPTY_ZSTR); + } } } } -- 2.40.0