Move the num_interfaces mutation to a safer place

tontonsb · tontonsb · commit 4ed9176f1e04 · 2025-02-14T23:00:23.000+02:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -3552,7 +3552,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) {
@@ -3598,6 +3597,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
`@@ -3552,7 +3552,6 @@ ZEND_API zend_class_entry zend_do_link_class(zend_class_entry ce, zend_string`
`3552`	`3552`	`}`
`3553`	`3553`	`}`
`3554`	`3554`	`}`
`3555`		`- ce->num_interfaces = num_implementable_interfaces;`
`3556`	`3555`
`3557`	`3556`	`#ifndef ZEND_WIN32`
`3558`	`3557`	`if (ce->ce_flags & ZEND_ACC_ENUM) {`
`@@ -3598,6 +3597,8 @@ ZEND_API zend_class_entry zend_do_link_class(zend_class_entry ce, zend_string`
`3598`	`3597`	`Z_CE_P(zv) = ce;`
`3599`	`3598`	`}`
`3600`	`3599`
	`3600`	`+ ce->num_interfaces = num_implementable_interfaces;`
	`3601`	`+`
`3601`	`3602`	`if (CG(unlinked_uses)) {`
`3602`	`3603`	`zend_hash_index_del(CG(unlinked_uses), (zend_long)(uintptr_t) ce);`
`3603`	`3604`	`}`