From: Marcus Boerger <helly@php.net>
Date: Fri, 16 Jul 2004 06:39:50 +0000 (+0000)
Subject: Bugfix #28464 catch() does not catch exceptions by interfaces
X-Git-Tag: PRE_ZEND_VM_DISPATCH_PATCH~493
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=381a3b234f6b5a276d61c8141ced8ae8002d6734;p=php

Bugfix #28464 catch() does not catch exceptions by interfaces
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 026b635a95..a958a1be60 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2929,21 +2929,16 @@ int zend_catch_handler(ZEND_OPCODE_HANDLER_ARGS)
 	}
 	ce = Z_OBJCE_P(EG(exception));
 	if (ce != EX_T(opline->op1.u.var).class_entry) {
-		while (ce->parent) {
-			if (ce->parent == EX_T(opline->op1.u.var).class_entry) {
-				goto exception_should_be_taken;
+		if (!instanceof_function(ce, EX_T(opline->op1.u.var).class_entry TSRMLS_CC)) {
+			if (opline->op1.u.EA.type) {
+				zend_throw_exception_internal(NULL TSRMLS_CC);
+				NEXT_OPCODE();
 			}
-			ce = ce->parent;
-		}
-		if (opline->op1.u.EA.type) {
-			zend_throw_exception_internal(NULL TSRMLS_CC);
-			NEXT_OPCODE();
+			SET_OPCODE(&op_array->opcodes[opline->extended_value]);
+			return 0; /* CHECK_ME */
 		}
-		SET_OPCODE(&op_array->opcodes[opline->extended_value]);
-		return 0; /* CHECK_ME */
 	}
 
-exception_should_be_taken:
 	zend_hash_update(EG(active_symbol_table), opline->op2.u.constant.value.str.val,
 		opline->op2.u.constant.value.str.len+1, &EG(exception), sizeof(zval *), (void **) NULL);
 	EG(exception) = NULL;