diff options
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 8d11513090..2b41f109cd 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1209,10 +1209,15 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s } } - function_add_ref(fn); - new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_op_array)); - memcpy(new_fn, fn, sizeof(zend_op_array)); - new_fn->common.fn_flags |= ZEND_ACC_ARENA_ALLOCATED; + if (UNEXPECTED(fn->type == ZEND_INTERNAL_FUNCTION)) { + new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_internal_function)); + memcpy(new_fn, fn, sizeof(zend_internal_function)); + new_fn->common.fn_flags |= ZEND_ACC_ARENA_ALLOCATED; + } else { + function_add_ref(fn); + new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_op_array)); + memcpy(new_fn, fn, sizeof(zend_op_array)); + } fn = zend_hash_update_ptr(&ce->function_table, key, new_fn); zend_add_magic_methods(ce, key, fn); } |