Merge branch 'PHP-7.2' into PHP-7.3

dstogov · dstogov · commit bc731f8e7a2b · 2018-09-03T10:21:42.000+03:00
* PHP-7.2:
  Fixed reference-countingin ZTS build.
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -1250,12 +1250,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
`@@ -1250,12 +1250,12 @@ static void zend_add_trait_method(zend_class_entry ce, const char name, zend_s`
`1250`	`1250`	`}`
`1251`	`1251`	`}`
`1252`	`1252`
	`1253`	`+ function_add_ref(fn);`
`1253`	`1254`	`if (UNEXPECTED(fn->type == ZEND_INTERNAL_FUNCTION)) {`
`1254`	`1255`	`new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_internal_function));`
`1255`	`1256`	`memcpy(new_fn, fn, sizeof(zend_internal_function));`
`1256`	`1257`	`new_fn->common.fn_flags \|= ZEND_ACC_ARENA_ALLOCATED;`
`1257`	`1258`	`} else {`
`1258`		`- function_add_ref(fn);`
`1259`	`1259`	`new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));`
`1260`	`1260`	`memcpy(new_fn, fn, sizeof(zend_op_array));`
`1261`	`1261`	`}`