From 66aba3c568091a136d4a155b22deaba9dbeeaa4f Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Tue, 10 Dec 2002 09:04:12 +0000 Subject: [PATCH] Fix check to allow for static+access level modifiers --- Zend/zend_compile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7f4ede57bb..4bda7474eb 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -912,7 +912,8 @@ void zend_do_free(znode *op1 TSRMLS_DC) int zend_do_verify_access_types(znode *current_access_type, znode *new_modifier) { - if (current_access_type->u.constant.value.lval & ZEND_ACC_PPP_MASK) { + if ((new_modifier->u.constant.value.lval & ZEND_ACC_PPP_MASK) + && ((current_access_type->u.constant.value.lval & ZEND_ACC_PPP_MASK) != (new_modifier->u.constant.value.lval & ZEND_ACC_PPP_MASK))) { zend_error(E_COMPILE_ERROR, "Multiple access type modifiers are not allowed"); } return (current_access_type->u.constant.value.lval | new_modifier->u.constant.value.lval); -- 2.40.0