Move the num_interfaces mutation to a safer place

tontonsb · tontonsb · commit dd8cb2852c40 · 2024-12-29T19:38:46.000+02:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -3538,7 +3538,6 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
 			}
 		}
 	}
-	ce->num_interfaces = num_implementable_interfaces;
 
 #ifndef ZEND_WIN32
 	if (ce->ce_flags & ZEND_ACC_ENUM) {
@@ -3584,6 +3583,8 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
 			Z_CE_P(zv) = ce;
 		}
 
+		ce->num_interfaces = num_implementable_interfaces;
+
 		if (CG(unlinked_uses)) {
 			zend_hash_index_del(CG(unlinked_uses), (zend_long)(uintptr_t) ce);
 		}

Original file line number	Diff line number	Diff line change
`@@ -3538,7 +3538,6 @@ ZEND_API zend_class_entry zend_do_link_class(zend_class_entry ce, zend_string`
`3538`	`3538`	`}`
`3539`	`3539`	`}`
`3540`	`3540`	`}`
`3541`		`- ce->num_interfaces = num_implementable_interfaces;`
`3542`	`3541`
`3543`	`3542`	`#ifndef ZEND_WIN32`
`3544`	`3543`	`if (ce->ce_flags & ZEND_ACC_ENUM) {`
`@@ -3584,6 +3583,8 @@ ZEND_API zend_class_entry zend_do_link_class(zend_class_entry ce, zend_string`
`3584`	`3583`	`Z_CE_P(zv) = ce;`
`3585`	`3584`	`}`
`3586`	`3585`
	`3586`	`+ ce->num_interfaces = num_implementable_interfaces;`
	`3587`	`+`
`3587`	`3588`	`if (CG(unlinked_uses)) {`
`3588`	`3589`	`zend_hash_index_del(CG(unlinked_uses), (zend_long)(uintptr_t) ce);`
`3589`	`3590`	`}`