From: Marcus Boerger <helly@php.net>
Date: Sat, 12 Mar 2005 22:42:37 +0000 (+0000)
Subject: - If an exception is pending we don't bail out but show the unhandled exception
X-Git-Tag: php-5.0.1b1~821
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dc04d98f21ead4ec16b26b463293421ba932974;p=php

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

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 0823420e3a..b84949e049 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -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;
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 89ca48fb57..dda89e9a4a 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -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;