Reorder updates to avoid race conditions

dstogov · dstogov · commit 476c333a8e29 · 2021-08-23T11:47:30.000+03:00
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
@@ -317,8 +317,8 @@ uint32_t zend_accel_get_class_name_map_ptr(zend_string *type_name)
 		do {
 			ret = (uint32_t)(uintptr_t)zend_map_ptr_new();
 		} while (ret <= 2);
-		GC_ADD_FLAGS(type_name, IS_STR_CLASS_NAME_MAP_PTR);
 		GC_SET_REFCOUNT(type_name, ret);
+		GC_ADD_FLAGS(type_name, IS_STR_CLASS_NAME_MAP_PTR);
 		return ret;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -317,8 +317,8 @@ uint32_t zend_accel_get_class_name_map_ptr(zend_string *type_name)`
`317`	`317`	`do {`
`318`	`318`	`ret = (uint32_t)(uintptr_t)zend_map_ptr_new();`
`319`	`319`	`} while (ret <= 2);`
`320`		`- GC_ADD_FLAGS(type_name, IS_STR_CLASS_NAME_MAP_PTR);`
`321`	`320`	`GC_SET_REFCOUNT(type_name, ret);`
	`321`	`+ GC_ADD_FLAGS(type_name, IS_STR_CLASS_NAME_MAP_PTR);`
`322`	`322`	`return ret;`
`323`	`323`	`}`
`324`	`324`