Fix incorrect prop_name release

nikic · nikic · commit fba8b955e91c · 2021-03-30T12:53:09.000+02:00
After 2c4346f the property name should no longer be released. This should fix the preloading failure under asan.
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -2080,8 +2080,6 @@ static void zend_do_traits_property_binding(zend_class_entry *ce, zend_class_ent
 								ZSTR_VAL(prop_name),
 								ZSTR_VAL(ce->name));
 					}
-
-					zend_string_release_ex(prop_name, 0);
 					continue;
 				}
 			}
@@ -2108,8 +2106,6 @@ static void zend_do_traits_property_binding(zend_class_entry *ce, zend_class_ent
 					GC_ADDREF(new_prop->attributes);
 				}
 			}
-
-			zend_string_release_ex(prop_name, 0);
 		} ZEND_HASH_FOREACH_END();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -2080,8 +2080,6 @@ static void zend_do_traits_property_binding(zend_class_entry *ce, zend_class_ent`
`2080`	`2080`	`ZSTR_VAL(prop_name),`
`2081`	`2081`	`ZSTR_VAL(ce->name));`
`2082`	`2082`	`}`
`2083`		`-`
`2084`		`- zend_string_release_ex(prop_name, 0);`
`2085`	`2083`	`continue;`
`2086`	`2084`	`}`
`2087`	`2085`	`}`
`@@ -2108,8 +2106,6 @@ static void zend_do_traits_property_binding(zend_class_entry *ce, zend_class_ent`
`2108`	`2106`	`GC_ADDREF(new_prop->attributes);`
`2109`	`2107`	`}`
`2110`	`2108`	`}`
`2111`		`-`
`2112`		`- zend_string_release_ex(prop_name, 0);`
`2113`	`2109`	`} ZEND_HASH_FOREACH_END();`
`2114`	`2110`	`}`
`2115`	`2111`	`}`