From 8e313becf4190a8cdc4ef52a1efdbce475f51ae0 Mon Sep 17 00:00:00 2001
From: John Boehr <jbboehr@gmail.com>
Date: Wed, 21 Sep 2016 20:09:45 -0700
Subject: Fix bug #69579

---
 Zend/zend_inheritance.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Zend/zend_inheritance.c')

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);
 }
-- 
cgit v1.2.1