Merge branch 'PHP-8.2' into PHP-8.3

nielsdos · nielsdos · commit f3d60a166ddc · 2023-10-29T21:47:35.000+01:00
* PHP-8.2:
  Fix memory leak in error path of zend_register_list_destructors_ex
diff --git a/Zend/zend_list.c b/Zend/zend_list.c
@@ -276,6 +276,7 @@ ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_fu
 	ZVAL_PTR(&zv, lde);
 
 	if (zend_hash_next_index_insert(&list_destructors, &zv) == NULL) {
+		free(lde);
 		return FAILURE;
 	}
 	return list_destructors.nNextFreeElement-1;

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,7 @@ ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_fu`
`276`	`276`	`ZVAL_PTR(&zv, lde);`
`277`	`277`
`278`	`278`	`if (zend_hash_next_index_insert(&list_destructors, &zv) == NULL) {`
	`279`	`+ free(lde);`
`279`	`280`	`return FAILURE;`
`280`	`281`	`}`
`281`	`282`	`return list_destructors.nNextFreeElement-1;`