Merge pull request #8991 from MochalovAlexey/eds_transaction_rollback_crash

Fix a possible use-after-free in EDS transaction rollback

Author: hvlad

src/jrd/extds/ExtDS.cpp

@@ -1639,15 +1639,30 @@ void Transaction::rollback(thread_db* tdbb, bool retain)
 	doRollback(&status, tdbb, retain);
 
 	Connection& conn = m_connection;
-	if (!retain)
+	const bool hasErrors = status->getState() & IStatus::STATE_ERRORS;
+
+	const auto cleanup = [&]()
 	{
-		detachFromJrdTran();
-		m_connection.deleteTransaction(tdbb, this);
-	}
+		if (!retain)
+		{
+			detachFromJrdTran();
+			m_connection.deleteTransaction(tdbb, this);
+		}
+	};
 
-	if (status->getState() & IStatus::STATE_ERRORS) {
-		conn.raise(&status, tdbb, "transaction rollback");
+	try
+	{
+		if (hasErrors) {
+			conn.raise(&status, tdbb, "transaction rollback");
+		}
+	}
+	catch (const Exception&)
+	{
+		cleanup();
+		throw;
 	}
+
+	cleanup();
 }
 
 Transaction* Transaction::getTransaction(thread_db* tdbb, Connection* conn, TraScope tra_scope)