diff options
| author | John Boehr <jbboehr@gmail.com> | 2016-09-21 20:09:45 -0700 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-09-22 12:32:37 +0200 |
| commit | 8e313becf4190a8cdc4ef52a1efdbce475f51ae0 (patch) | |
| tree | 37346f7212994d48f7ede762ac791ca9d5c87697 /Zend/zend_inheritance.c | |
| parent | 01759c43463c30b57c15e32c5f4b454fba81f039 (diff) | |
| download | php-git-8e313becf4190a8cdc4ef52a1efdbce475f51ae0.tar.gz | |
Fix bug #69579
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 85aadcb29e..00c514259b 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1180,6 +1180,7 @@ 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; fn = zend_hash_update_ptr(&ce->function_table, key, new_fn); zend_add_magic_methods(ce, key, fn); } |