Fix check to allow for static+access level modifiers

zsuraski · zsuraski · commit 66aba3c56809 · 2002-12-10T09:04:12.000Z
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -912,7 +912,8 @@ void zend_do_free(znode *op1 TSRMLS_DC)`
`912`	`912`
`913`	`913`	`int zend_do_verify_access_types(znode current_access_type, znode new_modifier)`
`914`	`914`	`{`
`915`		`- if (current_access_type->u.constant.value.lval & ZEND_ACC_PPP_MASK) {`
	`915`	`+ if ((new_modifier->u.constant.value.lval & ZEND_ACC_PPP_MASK)`
	`916`	`+ && ((current_access_type->u.constant.value.lval & ZEND_ACC_PPP_MASK) != (new_modifier->u.constant.value.lval & ZEND_ACC_PPP_MASK))) {`
`916`	`917`	`zend_error(E_COMPILE_ERROR, "Multiple access type modifiers are not allowed");`
`917`	`918`	`}`
`918`	`919`	`return (current_access_type->u.constant.value.lval \| new_modifier->u.constant.value.lval);`