mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-25 17:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

- If an exception is pending we don't bail out but show the unhandled exception

Browse Source
This commit is contained in:
Marcus Boerger 2005-03-12 22:42:37 +00:00
parent f56e5c045c
commit 6dc04d98f2
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zend/zend_vm_def.h
View File

@ -3254,6 +3254,9 @@ ZEND_VM_HANDLER(79, ZEND_EXIT, CONST|TMP|VAR|UNUSED|CV, ANY)
{
zend_op *opline = EX(opline);
if (EG(exception)) {
ZEND_VM_RETURN();
}
if (OP1_TYPE != IS_UNUSED) {
zval *ptr;
zend_free_op free_op1;

18
Zend/zend_vm_execute.h
View File

@ -2081,6 +2081,9 @@ static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
if (EG(exception)) {
ZEND_VM_RETURN();
}
if (IS_CONST != IS_UNUSED) {
zval *ptr;
zend_free_op free_op1;
@ -4540,6 +4543,9 @@ static int ZEND_EXIT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
if (EG(exception)) {
ZEND_VM_RETURN();
}
if (IS_TMP_VAR != IS_UNUSED) {
zval *ptr;
zend_free_op free_op1;
@ -7752,6 +7758,9 @@ static int ZEND_EXIT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
if (EG(exception)) {
ZEND_VM_RETURN();
}
if (IS_VAR != IS_UNUSED) {
zval *ptr;
zend_free_op free_op1;
@ -13291,6 +13300,9 @@ static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
if (EG(exception)) {
ZEND_VM_RETURN();
}
if (IS_UNUSED != IS_UNUSED) {
zval *ptr;
zend_free_op free_op1;
@ -18404,6 +18416,9 @@ static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
if (EG(exception)) {
ZEND_VM_RETURN();
}
if (IS_CV != IS_UNUSED) {
zval *ptr;
zend_free_op free_op1;
@ -30960,6 +30975,9 @@ static int ZEND_EXIT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
if (EG(exception)) {
ZEND_VM_RETURN();
}
if (opline->op1.op_type != IS_UNUSED) {
zval *ptr;
zend_free_op free_op1;