| Marcus Boerger 2005-03-12, 8:55 pm |
| helly Sat Mar 12 17:42:38 2005 EDT
Modified files:
/ZendEngine2 zend_vm_execute.h
Log:
- If an exception is pending we don't bail out but show the unhandled exception
http://cvs.php.net/diff.php/ZendEng...19&r2=1.20&ty=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.19 ZendEngine2/zend_vm_execute.h:1.20
--- ZendEngine2/zend_vm_execute.h:1.19 Wed Mar 9 21:32:00 2005
+++ ZendEngine2/zend_vm_execute.h Sat Mar 12 17:42:37 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_execute.h,v 1.19 2005/03/10 02:32:00 helly Exp $ */
+/* $Id: zend_vm_execute.h,v 1.20 2005/03/12 22:42:37 helly Exp $ */
#define ZEND_VM_CONTINUE() return 0
@@ -2081,6 +2081,9 @@
{
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 @@
{
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 @@
{
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 @@
{
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 @@
{
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 @@
{
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;
|