Skip to content

Fixed bug #63428 (The behavior of execute() changed) #227

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

Closed
wants to merge 1 commit into from
Closed

Fixed bug #63428 (The behavior of execute() changed) #227

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
8 changes: 7 additions & 1 deletion Zend/zend_vm_execute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,13 @@ ZEND_API void execute_ex(zend_execute_data *execute_data TSRMLS_DC)

ZEND_API void execute(zend_op_array *op_array TSRMLS_DC)
{
zend_execute_data *execute_data = zend_create_execute_data_from_op_array(op_array, 0 TSRMLS_CC);
zend_execute_data *execute_data;

if (EG(exception)) {
return;
}

execute_data = zend_create_execute_data_from_op_array(op_array, 0 TSRMLS_CC);

execute_ex(execute_data TSRMLS_CC);
}
Expand Down
8 changes: 7 additions & 1 deletion Zend/zend_vm_execute.skl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,13 @@ ZEND_API void {%EXECUTOR_NAME%}_ex(zend_execute_data *execute_data TSRMLS_DC)

ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC)
{
zend_execute_data *execute_data = zend_create_execute_data_from_op_array(op_array, 0 TSRMLS_CC);
zend_execute_data *execute_data;

if (EG(exception)) {
return;
}

execute_data = zend_create_execute_data_from_op_array(op_array, 0 TSRMLS_CC);

{%EXECUTOR_NAME%}_ex(execute_data TSRMLS_CC);
}
Expand Down