Fixed reference-countingin ZTS build.

dstogov · dstogov · commit 7fde2243a712 · 2018-09-03T10:20:40.000+03:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -1224,12 +1224,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));
 	}

Original file line number	Diff line number	Diff line change
`@@ -1224,12 +1224,12 @@ static void zend_add_trait_method(zend_class_entry ce, const char name, zend_s`
`1224`	`1224`	`}`
`1225`	`1225`	`}`
`1226`	`1226`
	`1227`	`+ function_add_ref(fn);`
`1227`	`1228`	`if (UNEXPECTED(fn->type == ZEND_INTERNAL_FUNCTION)) {`
`1228`	`1229`	`new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_internal_function));`
`1229`	`1230`	`memcpy(new_fn, fn, sizeof(zend_internal_function));`
`1230`	`1231`	`new_fn->common.fn_flags \|= ZEND_ACC_ARENA_ALLOCATED;`
`1231`	`1232`	`} else {`
`1232`		`- function_add_ref(fn);`
`1233`	`1233`	`new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));`
`1234`	`1234`	`memcpy(new_fn, fn, sizeof(zend_op_array));`
`1235`	`1235`	`}`