summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2002-12-07 15:53:37 +0000
committerZeev Suraski <zeev@php.net>2002-12-07 15:53:37 +0000
commitc087d9e9e498ff60e245c0235993cc7b05a56154 (patch)
tree705c12c1c0e45df4e5679656ebd9332eb35416cf
parente156edb1d0aa602793c191243d6f7cbddafb6f9e (diff)
downloadphp-git-c087d9e9e498ff60e245c0235993cc7b05a56154.tar.gz
Fix error messages
-rw-r--r--Zend/zend_execute.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 6259477501..1c987a8d65 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2257,6 +2257,8 @@ int zend_init_ctor_call_handler(ZEND_OPCODE_HANDLER_ARGS)
*/
inline int zend_check_private(zend_execute_data *execute_data, zend_class_entry *ce, int fn_flags, char *function_name_strval, int function_name_strlen TSRMLS_DC)
{
+ zend_function *orig_fbc;
+
if (!ce) {
return 0;
}
@@ -2271,6 +2273,8 @@ inline int zend_check_private(zend_execute_data *execute_data, zend_class_entry
return 1;
}
+ orig_fbc = EX(fbc);
+
/* Check rule #2 */
while (ce) {
if (ce == EG(scope)) {
@@ -2283,6 +2287,8 @@ inline int zend_check_private(zend_execute_data *execute_data, zend_class_entry
}
ce = ce->parent;
}
+
+ EX(fbc) = orig_fbc;
return 0;
}