summaryrefslogtreecommitdiff
path: root/Zend/zend_inheritance.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2018-09-03 10:21:55 +0300
committerDmitry Stogov <dmitry@zend.com>2018-09-03 10:21:55 +0300
commita57ec0aeb5d0329e98603e3102df98ae33947829 (patch)
tree541cf0b469fda746ab6d8e9485b1675249ee802b /Zend/zend_inheritance.c
parentef999f07355490f13d612be10960d21c7bd22a85 (diff)
parentbc731f8e7a2b11edb35ebd85248c362d88511e12 (diff)
downloadphp-git-a57ec0aeb5d0329e98603e3102df98ae33947829.tar.gz
Merge branch 'PHP-7.3'
* PHP-7.3: Fixed reference-countingin ZTS build.
Diffstat (limited to 'Zend/zend_inheritance.c')
-rw-r--r--Zend/zend_inheritance.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index df48108bfe..d9711977bf 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -1322,12 +1322,12 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
}
}
+ function_add_ref(fn);
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));
}