Zend: Use zend_bad_method_call() when cloning from the wrong scope

TimWolla · TimWolla · commit 270af523b8a0 · 2025-07-01T12:10:09.000+02:00
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
@@ -90,11 +90,7 @@ ZEND_FUNCTION(clone)
 	}
 
 	if (clone && !zend_check_method_accessible(clone, scope)) {
-		zend_throw_error(NULL, "Call to %s %s::__clone() from %s%s",
-			zend_visibility_string(clone->common.fn_flags), ZSTR_VAL(clone->common.scope->name),
-			scope ? "scope " : "global scope",
-			scope ? ZSTR_VAL(scope->name) : ""
-		);
+		zend_bad_method_call(clone, clone->common.function_name, scope);
 		RETURN_THROWS();
 	}
 
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -4123,15 +4123,6 @@ static zend_never_inline void zend_fetch_this_var(int type OPLINE_DC EXECUTE_DAT
 	}
 }
 
-static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_clone_call(zend_function *clone, zend_class_entry *scope)
-{
-	zend_throw_error(NULL, "Call to %s %s::__clone() from %s%s",
-		zend_visibility_string(clone->common.fn_flags), ZSTR_VAL(clone->common.scope->name),
-		scope ? "scope " : "global scope",
-		scope ? ZSTR_VAL(scope->name) : ""
-	);
-}
-
 #if ZEND_INTENSIVE_DEBUGGING
 
 #define CHECK_SYMBOL_TABLES()													\
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -6044,7 +6044,7 @@ ZEND_VM_COLD_CONST_HANDLER(110, ZEND_CLONE, CONST|TMPVAR|UNUSED|THIS|CV, ANY)
 	if (clone && !(clone->common.fn_flags & ZEND_ACC_PUBLIC)) {
 		scope = EX(func)->op_array.scope;
 		if (!zend_check_method_accessible(clone, scope)) {
-			zend_wrong_clone_call(clone, scope);
+			zend_bad_method_call(clone, clone->common.function_name, scope);
 			FREE_OP1();
 			ZVAL_UNDEF(EX_VAR(opline->result.var));
 			HANDLE_EXCEPTION();
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h

Original file line number	Diff line number	Diff line change
`@@ -90,11 +90,7 @@ ZEND_FUNCTION(clone)`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`if (clone && !zend_check_method_accessible(clone, scope)) {`
`93`		`- zend_throw_error(NULL, "Call to %s %s::__clone() from %s%s",`
`94`		`- zend_visibility_string(clone->common.fn_flags), ZSTR_VAL(clone->common.scope->name),`
`95`		`- scope ? "scope " : "global scope",`
`96`		`- scope ? ZSTR_VAL(scope->name) : ""`
`97`		`- );`
	`93`	`+ zend_bad_method_call(clone, clone->common.function_name, scope);`
`98`	`94`	`RETURN_THROWS();`
`99`	`95`	`}`
`100`	`96`
Original file line number	Diff line number	Diff line change
`@@ -4123,15 +4123,6 @@ static zend_never_inline void zend_fetch_this_var(int type OPLINE_DC EXECUTE_DAT`
`4123`	`4123`	`}`
`4124`	`4124`	`}`
`4125`	`4125`
`4126`		`-static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_clone_call(zend_function clone, zend_class_entry scope)`
`4127`		`-{`
`4128`		`- zend_throw_error(NULL, "Call to %s %s::__clone() from %s%s",`
`4129`		`- zend_visibility_string(clone->common.fn_flags), ZSTR_VAL(clone->common.scope->name),`
`4130`		`- scope ? "scope " : "global scope",`
`4131`		`- scope ? ZSTR_VAL(scope->name) : ""`
`4132`		`- );`
`4133`		`-}`
`4134`		`-`
`4135`	`4126`	`#if ZEND_INTENSIVE_DEBUGGING`
`4136`	`4127`
`4137`	`4128`	`#define CHECK_SYMBOL_TABLES() \`