Fix GH-17866: zend_mm_heap corrupted error after upgrading from 8.4.3 to 8.4.4#17880
Closed
ndossche wants to merge 5 commits intophp:PHP-8.4from
Closed
Fix GH-17866: zend_mm_heap corrupted error after upgrading from 8.4.3 to 8.4.4#17880ndossche wants to merge 5 commits intophp:PHP-8.4from
ndossche wants to merge 5 commits intophp:PHP-8.4from
Conversation
…4.3 to 8.4.4 This regressed in phpGH-17592. The function is with its attributes HashTable* is copied in zend_get_closure_invoke_method() but its refcount is not increased. This caused a crash in the Symfony demo page.
ndossche
commented
Feb 21, 2025
dstogov
approved these changes
Feb 24, 2025
TimWolla
reviewed
Feb 24, 2025
Member
Author
|
@dstogov While reviewing #17914 I started wondering why we need to refcount the attributes on trampolines in the first place. The attributes always come from a real function created by the compiler. So it seems to me that the real function, with its attributes, always lives longer than the trampoline. diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 277430ce102..efcb7fd5ed3 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1618,12 +1618,7 @@ ZEND_API zend_function *zend_get_call_trampoline_func(const zend_class_entry *ce
| ZEND_ACC_PUBLIC
| ZEND_ACC_VARIADIC
| (fbc->common.fn_flags & (ZEND_ACC_RETURN_REFERENCE|ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED));
- if (fbc->common.attributes) {
- func->attributes = fbc->common.attributes;
- GC_TRY_ADDREF(func->attributes);
- } else {
- func->attributes = NULL;
- }
+ func->attributes = fbc->common.attributes;
if (is_static) {
func->fn_flags |= ZEND_ACC_STATIC;
}
diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h
index 2fc59d5020c..c7348a74245 100644
--- a/Zend/zend_object_handlers.h
+++ b/Zend/zend_object_handlers.h
@@ -339,10 +339,6 @@ ZEND_API bool ZEND_FASTCALL zend_asymmetric_property_has_set_access(const zend_p
} while (0)
#define zend_free_trampoline(func) do { \
- HashTable *attributes = (func)->common.attributes; \
- if (attributes && !(GC_FLAGS(attributes) & GC_IMMUTABLE) && !GC_DELREF(attributes)) { \
- zend_array_destroy(attributes); \
- } \
if ((func) == &EG(trampoline)) { \
EG(trampoline).common.attributes = NULL; \
EG(trampoline).common.function_name = NULL; \
The code becomes a bit simpler. |
Member
I think, you are right. We also don't increment reference-counter of |
TimWolla
approved these changes
Feb 24, 2025
dstogov
approved these changes
Feb 24, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This regressed in GH-17592.
The function is with its attributes HashTable* is copied in zend_get_closure_invoke_method() but its refcount is not increased. This caused a crash in the Symfony demo page.