Skip to content

Commit 636b164

Browse files
committed
Fixed crashes introduced by 7e597f4 (only master was affected)
1 parent a111dfa commit 636b164

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Zend/zend_compile.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4057,7 +4057,10 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{
40574057
fbc = zend_hash_find_ptr(&ce->function_table, lcname);
40584058
if (fbc && !(fbc->common.fn_flags & ZEND_ACC_PUBLIC)) {
40594059
if (ce != CG(active_class_entry)
4060-
&&((fbc->common.fn_flags & ZEND_ACC_PRIVATE)
4060+
&& ((fbc->common.fn_flags & ZEND_ACC_PRIVATE)
4061+
|| !(fbc->common.scope->ce_flags & ZEND_ACC_LINKED)
4062+
|| (CG(active_class_entry)
4063+
&& !(CG(active_class_entry)->ce_flags & ZEND_ACC_LINKED))
40614064
|| !zend_check_protected(zend_get_function_root_class(fbc), CG(active_class_entry)))) {
40624065
/* incompatibe function */
40634066
fbc = NULL;

0 commit comments

Comments
 (0)