Skip to content

Simplify zend_forbid_dynamic_call() #7443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2021
Merged

Simplify zend_forbid_dynamic_call() #7443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Zend/zend_API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,13 +689,13 @@ ZEND_API void zend_detach_symbol_table(zend_execute_data *execute_data);
ZEND_API zend_result zend_set_local_var(zend_string *name, zval *value, bool force);
ZEND_API zend_result zend_set_local_var_str(const char *name, size_t len, zval *value, bool force);

static zend_always_inline zend_result zend_forbid_dynamic_call(const char *func_name)
static zend_always_inline zend_result zend_forbid_dynamic_call(void)
{
zend_execute_data *ex = EG(current_execute_data);
ZEND_ASSERT(ex != NULL && ex->func != NULL);

if (ZEND_CALL_INFO(ex) & ZEND_CALL_DYNAMIC) {
zend_throw_error(NULL, "Cannot call %s dynamically", func_name);
zend_throw_error(NULL, "Cannot call %s() dynamically", get_active_function_name());
return FAILURE;
}

Expand Down
8 changes: 4 additions & 4 deletions Zend/zend_builtin_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ ZEND_FUNCTION(func_num_args)
RETURN_THROWS();
}

if (zend_forbid_dynamic_call("func_num_args()") == FAILURE) {
if (zend_forbid_dynamic_call() == FAILURE) {
RETURN_LONG(-1);
}

Expand Down Expand Up @@ -188,7 +188,7 @@ ZEND_FUNCTION(func_get_arg)
RETURN_THROWS();
}

if (zend_forbid_dynamic_call("func_get_arg()") == FAILURE) {
if (zend_forbid_dynamic_call() == FAILURE) {
RETURN_THROWS();
}

Expand Down Expand Up @@ -226,7 +226,7 @@ ZEND_FUNCTION(func_get_args)
RETURN_THROWS();
}

if (zend_forbid_dynamic_call("func_get_args()") == FAILURE) {
if (zend_forbid_dynamic_call() == FAILURE) {
RETURN_THROWS();
}

Expand Down Expand Up @@ -1331,7 +1331,7 @@ ZEND_FUNCTION(get_defined_vars)

ZEND_PARSE_PARAMETERS_NONE();

if (zend_forbid_dynamic_call("get_defined_vars()") == FAILURE) {
if (zend_forbid_dynamic_call() == FAILURE) {
return;
}

Expand Down
4 changes: 2 additions & 2 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2407,7 +2407,7 @@ PHP_FUNCTION(extract)
}
}

if (zend_forbid_dynamic_call("extract()") == FAILURE) {
if (zend_forbid_dynamic_call() == FAILURE) {
return;
}

Expand Down Expand Up @@ -2523,7 +2523,7 @@ PHP_FUNCTION(compact)
Z_PARAM_VARIADIC('+', args, num_args)
ZEND_PARSE_PARAMETERS_END();

if (zend_forbid_dynamic_call("compact()") == FAILURE) {
if (zend_forbid_dynamic_call() == FAILURE) {
return;
}

Expand Down