Fix throw during exception destruction

nikic · nikic · commit b77cf4805ef6 · 2020-05-26T11:38:51.000+02:00
diff --git a/Zend/tests/try/catch_novar_2.phpt b/Zend/tests/try/catch_novar_2.phpt
@@ -15,5 +15,12 @@ try {
 }
 echo "Unreachable fallthrough\n";
 
---EXPECT--
+?>
+--EXPECTF--
 Throwing
+
+Fatal error: Uncaught RuntimeException: ThrowsOnDestruct::__destruct in %s:%d
+Stack trace:
+#0 %s(%d): ThrowsOnDestruct->__destruct()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -4453,7 +4453,6 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, JMP_ADDR, LAST_CATCH|CACHE_SLOT)
 	USE_OPLINE
 	zend_class_entry *ce, *catch_ce;
 	zend_object *exception;
-	zval *ex;
 
 	SAVE_OPLINE();
 	/* Check whether an exception has been thrown, if not, jump over code */
@@ -4487,21 +4486,23 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, JMP_ADDR, LAST_CATCH|CACHE_SLOT)
 
 	exception = EG(exception);
 	if (RETURN_VALUE_USED(opline)) {
-		ex = EX_VAR(opline->result.var);
+		zval *ex = EX_VAR(opline->result.var);
 		if (UNEXPECTED(Z_ISREF_P(ex))) {
 			ex = Z_REFVAL_P(ex);
 		}
 		zval_ptr_dtor(ex);
 		ZVAL_OBJ(ex, EG(exception));
-	} else {
-		OBJ_RELEASE(EG(exception));
-	}
-	if (UNEXPECTED(EG(exception) != exception)) {
-		ZVAL_UNDEF(ex);
-		HANDLE_EXCEPTION();
+		if (UNEXPECTED(EG(exception) != exception)) {
+			ZVAL_UNDEF(ex);
+			HANDLE_EXCEPTION();
+		} else {
+			EG(exception) = NULL;
+			ZEND_VM_NEXT_OPCODE();
+		}
 	} else {
 		EG(exception) = NULL;
-		ZEND_VM_NEXT_OPCODE();
+		OBJ_RELEASE(exception);
+		ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 	}
 }
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -3669,7 +3669,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_HANDLER(ZEND_
 	USE_OPLINE
 	zend_class_entry *ce, *catch_ce;
 	zend_object *exception;
-	zval *ex;
 
 	SAVE_OPLINE();
 	/* Check whether an exception has been thrown, if not, jump over code */
@@ -3703,21 +3702,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_HANDLER(ZEND_
 
 	exception = EG(exception);
 	if (RETURN_VALUE_USED(opline)) {
-		ex = EX_VAR(opline->result.var);
+		zval *ex = EX_VAR(opline->result.var);
 		if (UNEXPECTED(Z_ISREF_P(ex))) {
 			ex = Z_REFVAL_P(ex);
 		}
 		zval_ptr_dtor(ex);
 		ZVAL_OBJ(ex, EG(exception));
-	} else {
-		OBJ_RELEASE(EG(exception));
-	}
-	if (UNEXPECTED(EG(exception) != exception)) {
-		ZVAL_UNDEF(ex);
-		HANDLE_EXCEPTION();
+		if (UNEXPECTED(EG(exception) != exception)) {
+			ZVAL_UNDEF(ex);
+			HANDLE_EXCEPTION();
+		} else {
+			EG(exception) = NULL;
+			ZEND_VM_NEXT_OPCODE();
+		}
 	} else {
 		EG(exception) = NULL;
-		ZEND_VM_NEXT_OPCODE();
+		OBJ_RELEASE(exception);
+		ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 	}
 }
 
