Merge branch 'PHP-7.1' into PHP-7.2

dstogov · dstogov · commit accf5ed621ee · 2018-09-03T10:21:32.000+03:00
* PHP-7.1:
  Fixed reference-countingin ZTS build.
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -1209,12 +1209,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
`@@ -1209,12 +1209,12 @@ static void zend_add_trait_method(zend_class_entry ce, const char name, zend_s`
`1209`	`1209`	`}`
`1210`	`1210`	`}`
`1211`	`1211`
	`1212`	`+ function_add_ref(fn);`
`1212`	`1213`	`if (UNEXPECTED(fn->type == ZEND_INTERNAL_FUNCTION)) {`
`1213`	`1214`	`new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_internal_function));`
`1214`	`1215`	`memcpy(new_fn, fn, sizeof(zend_internal_function));`
`1215`	`1216`	`new_fn->common.fn_flags \|= ZEND_ACC_ARENA_ALLOCATED;`
`1216`	`1217`	`} else {`
`1217`		`- function_add_ref(fn);`
`1218`	`1218`	`new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));`
`1219`	`1219`	`memcpy(new_fn, fn, sizeof(zend_op_array));`
`1220`	`1220`	`}`