Merge branch 'PHP-7.3'

dstogov · dstogov · commit a57ec0aeb5d0 · 2018-09-03T10:21:55.000+03:00
* PHP-7.3:
  Fixed reference-countingin ZTS build.
diff --git 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));
 	}

Original file line number	Diff line number	Diff line change
`@@ -1322,12 +1322,12 @@ static void zend_add_trait_method(zend_class_entry ce, const char name, zend_s`
`1322`	`1322`	`}`
`1323`	`1323`	`}`
`1324`	`1324`
	`1325`	`+ function_add_ref(fn);`
`1325`	`1326`	`if (UNEXPECTED(fn->type == ZEND_INTERNAL_FUNCTION)) {`
`1326`	`1327`	`new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_internal_function));`
`1327`	`1328`	`memcpy(new_fn, fn, sizeof(zend_internal_function));`
`1328`	`1329`	`new_fn->common.fn_flags \|= ZEND_ACC_ARENA_ALLOCATED;`
`1329`	`1330`	`} else {`
`1330`		`- function_add_ref(fn);`
`1331`	`1331`	`new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));`
`1332`	`1332`	`memcpy(new_fn, fn, sizeof(zend_op_array));`
`1333`	`1333`	`}`