cvs: ZendEngine2 / zend_object_handlers.c

zeev Sun Jun 8 15:28:30 2003 EDT Modified files: /ZendEngine2 zend_object_handlers.c Log: Fix casing issues in access level checks Index: ZendEngine2/zend_object_handlers.c diff -u ZendEngine2/zend_object_handlers.c:1.51 ZendEngine2/zend_object_handlers.c:1.52 --- ZendEngine2/zend_object_handlers.c:1.51 Wed Jun 4 04:16:55 2003 +++ ZendEngine2/zend_object_handlers.c Sun Jun 8 15:28:29 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_object_handlers.c,v 1.51 2003/06/04 08:16:55 stas Exp $ */ +/* $Id: zend_object_handlers.c,v 1.52 2003/06/08 19:28:29 zeev Exp $ */ #include "zend.h" #include "zend_globals.h" @@ -578,7 +578,7 @@ if (EG(scope) && fbc->op_array.fn_flags & ZEND_ACC_CHANGED) { zend_function *priv_fbc; - if (zend_hash_find(&EG(scope)->function_table, method_name, method_len+1, (void **) &priv_fbc)==SUCCESS + if (zend_hash_find(&EG(scope)->function_table, lc_method_name, method_len+1, (void **) &priv_fbc)==SUCCESS && priv_fbc->common.fn_flags & ZEND_ACC_PRIVATE) { fbc = priv_fbc; } @@ -588,7 +588,7 @@ /* Ensure that if we're calling a private function, we're allowed to do so. */ - updated_fbc = zend_check_private(fbc, object->value.obj.handlers->get_class_entry(object TSRMLS_CC), fbc->common.fn_flags, method_name, method_len TSRMLS_CC); + updated_fbc = zend_check_private(fbc, object->value.obj.handlers->get_class_entry(object TSRMLS_CC), fbc->common.fn_flags, lc_method_name, method_len TSRMLS_CC); if (!updated_fbc) { zend_error(E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name, EG(scope) ? EG(scope)->name : ""); }